Merge pull request #856 from MITx/feature/cale/edge-configs

cms/envs/aws.py

cms/envs/dev.py

cms/envs/logsettings.py

cms/urls.py

common/djangoapps/heartbeat/__init__.py

common/djangoapps/heartbeat/urls.py

common/djangoapps/heartbeat/views.py

common/lib/logsettings.py

common/lib/xmodule/xmodule/contentstore/mongo.py

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

common/lib/xmodule/xmodule/x_module.py

lms/djangoapps/courseware/tabs.py

lms/envs/askbotsettings.py

lms/envs/aws.py

lms/envs/cms/aws.py

lms/envs/cms/dev.py

lms/envs/common.py

lms/envs/dev.py

lms/envs/dev_edx4edx.py

lms/envs/dev_ike.py