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

This reverts commit a517dc208588509df3337fc7ce35e513f5d65b5a.