If you open a particular user profile page there
will be discussion where that user has collaborated.
If you click on view discussion link it would return
404 becuase of the missing discussion id in the link.
I fixed it by adding the thread commentable id to link
instead of getting the id from discussion object.

TNL-1717

Make sure slashes in JSON content don't end script tags. PLAT-462

The string "</script>" in JSON data would end the script element we're
embedding the data in.  To make sure the data doesn't disrupt the
script, we escape the slash as \/ .

Merge release to master for 20150317 release.

Reverting the change to add a 201_CREATED status to the enrollment API.

Fix or remove tearDown methods that don't use super.

MA-7: A/B test and cohorted content support

UX-1642 Making visual tweaks and enhancements to the logistration form

Update newrelic agent for monitoring celery tasks

XCOM-45 Enrollment API supports creating modes other than honor.

Copy changes to the activation email

Downgrade CORS middleware warning to info

Certificates: Revising Web Templates + UI for Open edX Use

Fixing tests, cleaning up POST handler to be easier to read.

Wording fixed for unit test comments.

Validating event emission by the commerce app

Fixed CourseMode Filtering Bug

Added SKU column to CourseMode table in Django admin

Allow services to ignore user throttling. Set a more realistic throttle for users.

Commerce code has now been updated to exclude CourseMode objects with SKU set to empty string (in addition to null).

Remove useless override_settings of MODULESTORE

Add show/hide previews button to Content Libraries

Awais786/ecom 1162 ga event

Add missing import of override_settings to fix a broken test in courseware