Conflicts:
	lms/envs/common.py (RESOLVED)

Do not show video_upload_pipeline setting if the feature is disabled

hotfix: China CDN cleanup and bugfixes

Add metatag <path_prefix> for pdf_viewer.html

For video module, don't use Mako unnecessarily

ECOM-1177: Removed the session variable on pay_and_verify view

ECOM-1155 fix the date diff issue.

Adding hints for otherwise quiet quality shard steps.

Fixed ID bug in China CDN experiment, added default, changed graphite metric name, and exposed CDN monitoring ENVs.

When configured, set an additional cookie with the CSRF
token for use by subdomains.

The cookie can have a different name than the default
CSRF cookie, preventing conflicts between cookies
from different domains (e.g. ".edx.org", "courses.edx.org",
and "edge.edx.org").

The new cookie is included only on the enrollment API
views so that the scope of this change is limited
to the end-points that require cross-domain POST requests.

Add pointer-events: none for fa-lock and fa-eye

Enable content libraries by default

Exfoliate flaky studio home test. (SOL-430)

Content Libraries Import/Export

Studio template updates

Addresses SOL-290.

Cross-domain CSRF cookies

Updates to account and profile APIs based on arch council feedback

Reorganized course_structures app

SOL-258 Removing preview and content type from search list for sequence ...

Celery requires all tasks to be in a tasks module. Also, the task has been updated to use default values if the the course structure generator encounters a block without the graded or format fields.

Combine the changes of SOL-199 and SOL-221

Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback

return proper 404 for assets of some invalid course from split modulesto...

PLAT-456

Upgrade PDF.js library from v0.8.1243 -> v1.0.907