Merge pull request #518 from edx/feanil/remove_mitx

Remove MITX from the name of the features dict.

playbooks/roles/edxapp/defaults/main.yml

@@ -59,7 +59,7 @@ EDXAPP_CELERY_PASSWORD: 'celery'
 
 EDXAPP_PLATFORM_NAME: 'edX'
 
-EDXAPP_MITX_FEATURES:
+EDXAPP_FEATURES:
   AUTH_USE_OPENID_PROVIDER: true
   CERTIFICATES_ENABLED: true
   ENABLE_DISCUSSION_SERVICE: true
@@ -234,7 +234,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
         host: $EDXAPP_MONGO_HOSTS
         password:  $EDXAPP_MONGO_PASSWORD
         port: $EDXAPP_MONGO_PORT
-        render_template:  'mitxmako.shortcuts.render_to_string'
+        render_template:  'edxmako.shortcuts.render_to_string'
         # Needed for the CMS to be able to run update_templates
         user: $EDXAPP_MONGO_USER
       DOC_STORE_CONFIG: *edxapp_generic_default_docstore
@@ -279,7 +279,7 @@ generic_env_config:  &edxapp_generic_env
   LOCAL_LOGLEVEL: $EDXAPP_LOG_LEVEL
   # default email backed set to local SMTP
   EMAIL_BACKEND: $EDXAPP_EMAIL_BACKEND
-  MITX_FEATURES: $EDXAPP_MITX_FEATURES
+  FEATURES: $EDXAPP_FEATURES
   WIKI_ENABLED: true
   SYSLOG_SERVER:  $EDXAPP_SYSLOG_SERVER
   SITE_NAME:  $EDXAPP_SITE_NAME
@@ -349,7 +349,7 @@ lms_auth_config:
               host: $EDXAPP_MONGO_HOSTS
               db: $EDXAPP_MONGO_DB_NAME
               collection: 'modulestore'
-              render_template: 'mitxmako.shortcuts.render_to_string'
+              render_template: 'edxmako.shortcuts.render_to_string'
               user: $EDXAPP_MONGO_USER
               password: $EDXAPP_MONGO_PASSWORD
               port: $EDXAPP_MONGO_PORT