Revert "Jarv/config refactor wip"
Merge pull request #6181 from edx/revert-6096-jarv/config-refactor-wip

Revert "Jarv/config refactor wip"
Merge remote-tracking branch 'upstream/master'