This reverts commit a796b563. Conflicts: lms/envs/common.py openedx/core/djangoapps/theming/models.py pavelib/assets.py pavelib/paver_tests/test_assets.py
