When overrides are set they are set by service variant name.
Merge pull request #1739 from edx/feanil/unbreak_edxapp

When overrides are set they are set by service variant name.