Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"...

..."

This reverts commit a517dc208588509df3337fc7ce35e513f5d65b5a.

@jarv @e0d Please confirm when I can unrevert your reversion, or do you need me to do surgery on this to make it backward compatible?