Merge pull request #4464 from edx/jbau/remove-branch-setting-cache

removing thread-local cache for branch_setting
always include GA file
Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register

fix shib reg from course about page
Piecemeal conversion to draft needs to allow
already converted children.
STUD-1965
adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups
recommender prototype
Merge pull request #4437 from Stanford-Online/giulio/theme-segment-io

always include GA file
Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs
Merge pull request #4462 from edx/bug/delete_draft

Piecemeal conversion to draft needs to allow
Merge pull request #4467 from edx/swli/rc-hotpatch-recommender

hotpatch for recommender (learning science)
Merge pull request #4469 from edx/jbau/dev-environments-disable-ANALYTICS_ACTIVE_COUNT

Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs
Merge pull request #4466 from edx/cdodge/change-course-access-role-admin

make sure the CourseAccessRole Django ORM Admin page uses a raw_id so th...
fix bulk_write context manager.
don't update ancestors while bulk editing.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
converge Split APIs with Mixed and Draft
more split_draft methods
BLD-1099: Edit group configurations.
Merge pull request #4424 from edx/anton/edit-group-configurations

Edit group configurations.
Merge pull request #4477 from edx/studio/minimal-fix-import-performance

Studio/minimal fix import performance
Corrected diff between 0K and 0 C