If microsites are enabled and it is a microsite request, then take the microsite path for theming
Update xblock-mentoring.

Update reference to the xblock-mentoring repository.

A bug where answers containing the string "??" would get mangled by jQuery has been fixed in xblock-mentoring.
add initial_state attribute to jsinput tag
Remove duplicated data from legacy events

When event-tracking was fully integrated into the platform, some data was replicated in the context in the middleware and then later extracted and moved the old location by event-tracking. The legacy code path was not updated to remove this transient shim data from the context resulting in duplication of the information. This patch ensures that the transient information is removed from the context before emitting the event.

Fixes: AN-2369
Use data dir from course.
Remove import.
Allow external_auth registrations to bypass PW complexity check
Updating SciPy
Updating acceptance (lettuce) db cache
Simplify bok choy environments to inherit pipeline settings from common.py
Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"

This reverts commit 252038c37664f90d5967f93454a6f23a0938258e, reversing
changes made to 7caf8c53b1a32ded0da4a50429f397efb7ba1ffc.
Fix incorrect max upload file size on forums

The file size is calculated and displayed as a number of bytes, but was
being incorrectly labeled as 'K' [0].

The size is now correctly labeled as "bytes" and the sentence now begins
with a leading captial letter.

Impact: This has been broken on master since 2012 [1].

[0] https://github.com/edx/edx-platform/blob/master/lms/djangoapps/django_comment_client/settings.py#L4
[1] https://github.com/edx/edx-platform/commit/5d90366917c6e81513e26ea4cb8305df0f3e6d97
Show category when an xblock does not have a default display name
Merge pull request #4292 from terman/jsinput

Supply initial_state attribute for jsinput tag
Merge pull request #4595 from edx/mvo/update_acceptance_db_caches

Updating acceptance (lettuce) db cache
enable sharding of bok-choy tests
add shard_1 flags to cms bok-choy tests
use paver commands in jenkins script
updated doctring to explain the bok-choy shards
adding discussion tests to shard_1