Merge release into master

SSO: Make email addresses in SAML metadata fully configurable

Revert "Remove unnecessary DB call in team pagination."

generate diff-coverage report in JS jenkins build

Conflicts:
	requirements/edx/github.txt

Multiple Patches

Revert "TNL-394: Fixed the confirmation message"

Improve course discovery filtering and empty search

This reverts commit 948f652c.

disable course discovery feature by default in devstack.

Add index on CourseTeam name.

Copy & Styling for Credit messages on Dashboard

ECOM-1917

Merge release into master

Fix Django Debug Toolbar circular imports

Pin the rc6266 fork release

Update testing.rst with info about bok choy accessibility tests

There's an "explicit" way to configure Django Debug Toolbar that isn't
prone to circular import errors:

http://django-debug-toolbar.readthedocs.org/en/1.0/installation.html#explicit-setup

Do that.

If we don't pin to the version, pip will see that we have a version of
rfc6266 installed and be fine with it.

Yes, you have to say it twice.

Autopublish when vertical is deleted

Fix markdown editor reference link having colon issue

Bump mongoengine version to 0.10.0

Sending focus to modal in CMS

Add discussion_topic_id to Team API docstrings

Small printing fixes (LMS)

Fixing paragraph spacing with inline class (capa)

Minor improvements to learner profile tests

ECOM-1817: updated the course name and also styling for the provider