USHIFT-936, USHIFT-942: reconcile the internal and external config data structures#1442

openshift-merge-robot merged 17 commits into

openshift:mainopenshift/microshift:mainfrom

dhellmann:USHIFT-936-reconcile-config-data-structuresdhellmann/microshift:USHIFT-936-reconcile-config-data-structuresCopy head branch name to clipboard