Merge branch 'drupal-new'

cms/envs/common.py

common/djangoapps/mitxmako/shortcuts.py

common/djangoapps/mitxmako/template.py

common/djangoapps/mitxmako/tests.py

common/djangoapps/student/views.py

common/djangoapps/terrain/steps.py

common/djangoapps/terrain/ui_helpers.py

lms/djangoapps/branding/views.py

lms/djangoapps/courseware/features/homepage.feature

lms/djangoapps/courseware/features/login.feature

lms/djangoapps/courseware/features/login.py

lms/djangoapps/courseware/features/registration.feature

lms/djangoapps/courseware/features/signup.feature

lms/djangoapps/courseware/features/signup.py

lms/djangoapps/courseware/tests/tests.py

lms/djangoapps/courseware/views.py

lms/envs/aws.py

lms/envs/common.py

lms/static/images/bg-banner-example.png

lms/static/images/bg-banner-login.png