"Use single yaml config instead of two json configs"

This reverts commit 8c805999e6.

openedx/core/djangoapps/plugins/README.rst

@@ -144,7 +144,7 @@ class::
                 ProjectType.LMS: {
 
                     # Configure each Settings Type, as needed.
-                    SettingsType.AWS: {
+                    SettingsType.PRODUCTION: {
 
                         # The python path (relative to this app) to the settings module for the relevant Project Type and Settings Type.
                         # Optional; Defaults to u'settings'.

openedx/core/djangoapps/plugins/constants.py

@@ -29,7 +29,8 @@ class SettingsType(object):
     See https://github.com/edx/edx-platform/master/lms/envs/docs/README.rst for
     further information on each Settings Type.
     """
-    AWS = u'aws'
+    AWS = u'aws'  # aws.py has been deprecated. See https://openedx.atlassian.net/browse/DEPR-14
+    PRODUCTION = u'production'
     COMMON = u'common'
     DEVSTACK = u'devstack'
     TEST = u'test'

openedx/core/djangoapps/zendesk_proxy/settings/aws.py

@@ -1,4 +1,4 @@
-""" Production settings for zendesk proxy."""
+""" AWS settings for zendesk proxy."""
 
 
 def plugin_settings(settings):