This reverts commit 7624c633.

2015-08-25 Release

Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYT…

Fixes modal color

Allow configuring sensitive third_party_auth settings via lms.auth.json

DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…

Fixed URL and course title in CCX enrollment/unenrollment email

	modified:   lms/djangoapps/instructor/tests/test_enrollment.py

bump version of edx-proctoring

Updated Certificate's config page help

Remove django-followit and django-keyedcache

Revert "JS Flakiness in TeamDiscussionView"

Upgrade django-extensions to 1.5.5

Upgrade django-ipware to 1.1.0

Update translations (autogenerated message)

Update edx-proctoring version to 0.7.1

Update edx-ora2 to release-2015-08-19T17.17.

JS Flakiness in TeamDiscussionView

Fix course info sidebar padding 

Adding waitsFor check in the beforeEach method. The condition I'm
waiting for here is shamelessly borrowed from bok-choy's
wait_for_ajax._is_ajax_finished() method:
https://github.com/edx/bok-choy/blob/master/bok_choy/page_object.py#L431

This seems to fix the errors I was able to generate with the
set_timeout, which themselves looked ver similar to the failing
master tests, so I *think* this will fix our woes, but since I was
never able to get the tests to fail exactly the same way I can't be sure.

Since there don't seem to be any drawbacks, this is going into mainline
as-is and we'll monitor for the sporadic failures over the next few
weeks.

alter columns in proctoring exam report

Fixing issue for french language

Upgrade django-babel-underscore to 0.3.0

Adds a comment to reduce confusion over remaining role name differences

Upgrade django-cors-headers to 1.1.0

Peter fogg/fix tnl 3101 quality