Merge pull request #1240 from edx/dhm/config_separation

...contentstore/management/commands/dump_course_structure.py

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/test_import_export.py

cms/djangoapps/contentstore/tests/test_import_nostatic.py

cms/envs/acceptance.py

cms/envs/dev.py

cms/envs/test.py

common/djangoapps/contentserver/tests/test.py

common/djangoapps/terrain/browser.py

common/lib/xmodule/xmodule/contentstore/django.py

common/lib/xmodule/xmodule/modulestore/__init__.py

common/lib/xmodule/xmodule/modulestore/django.py

common/lib/xmodule/xmodule/modulestore/mixed.py

common/lib/xmodule/xmodule/modulestore/mongo/base.py

common/lib/xmodule/xmodule/modulestore/split_mongo/split.py

common/lib/xmodule/xmodule/modulestore/store_utilities.py

common/lib/xmodule/xmodule/modulestore/tests/django_utils.py

...odule/xmodule/modulestore/tests/test_mixed_modulestore.py

common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py

common/lib/xmodule/xmodule/modulestore/tests/test_publish.py