Clean some stuff from runconfig that are cli only… Upstream-commit: 2e880dd199 Component: cli
2e880dd199