Changes to address comments/suggestions in PR, including
removal of importing Settings in cms/envs/common.py.