Fix extracted from https://github.com/edx/edx-platform/pull/6035.

Preserve the contribution amount specified on the track selection page.

Do a better job translating "Program Manager"

make asides render in studio

Make bok_choy tests clean up test files before executing

Quiet analytics.init stderr output for tests.

Enrollment API Cleanup

Consolidate PUT and POST on the RESTful Layer.

Change URLs for API

Test cleanup.

Adding a course details URL to the enrollment API.

Change student to user

Change to v1, remove feature flag from API URLs

Updating student to user in tests

Re-ordering redirect urls to be evaluated last.

Adding pagination and testing.

Adding Django REST settings for pagination.

Revert "Re-ordering redirect urls to be evaluated last."

This reverts commit 4c9502daa383e49b46f8abec5456c271e5e24ccb.

Re-ordering redirect urls to be evaluated last.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding Django REST settings for pagination."

This reverts commit 9f8a54c41f34caa24818c88f1e75ac59f6ce5259.

Conflicts:
	common/djangoapps/enrollment/urls.py

Revert "Adding pagination and testing."

This reverts commit 0b2d46262abb78f5ad170700205e7fd28b6af942.

Additional testing, logging, and error messages.

for tests change the default xml data dir 

Split payment/verification business intelligence analytics

Fixed CodeMirror editor view height in studio.

TNL-920

WL-172 Show a Order History list on the Student Dashboard for any PaidCo...

Track verify now and verify later choices, image captures, image retake, and name changes, as well as virtual pageviews for every step in the new flow(s).

WL-172 Show a Order History list on the Student Dashboard for any PaidCourseRegistration or RegCodeItem that the user might have purchased

PLAT-280

Make XmlModuleStore handle asides

Update django-nose version

PLAT-221

optionally using environment variable for edx-platform hash

Remove Segment events from courseware.

Add tracking for refunds.

Add payment information to payment confirmation page

In user profile changing page should reposition window to top

OAuth signature should be verified against URL provided to the tool.  

Update to the latest lettuce and install from pypi

Advanced settings discussion category ids should be unique.

There is possibility that a proxy will change URL along the way (for
example protocol from https to http) which would invalidate signature.
Supporting LTI_1 and LTI_2 use case.

When we change the page using pagination in the user
profile page the data gets updated but the position
of the window remains at pagination. It should change
position of window to top.

TNL-107

If the ids in the adnvaced setting discussion category are
not unique then threads under categories with different name
will come in every category with same id. Ids should be unique
inorder to differentiate between different categories.

TNL-752

Fixed unicode problem if transcript file is not UTF-8 encoded.

TNL-527