Merge pull request #9487 from edx/release-2015-08-26-conflict

common/djangoapps/third_party_auth/admin.py

common/djangoapps/third_party_auth/models.py

common/djangoapps/third_party_auth/tests/test_provider.py

common/djangoapps/third_party_auth/tests/test_views.py

lms/djangoapps/ccx/views.py

lms/djangoapps/instructor/enrollment.py

lms/djangoapps/instructor/tests/test_enrollment.py

lms/envs/aws.py

lms/static/sass/shared/_modal.scss

lms/templates/emails/enroll_email_enrolledmessage.txt

lms/templates/emails/enroll_email_enrolledsubject.txt

requirements/edx/github.txt