Adding django default log handlers into logging configuration
Add missing mimetypes for xblock resources
Add mimetype additions in studio startup
Adding template tag to render the microsite favicon
Adding template tag to render microsite css_overrides_file
Remove course ID from title in course about page
If microsites are enabled and it is a microsite request, then take the microsite path for theming
Updating settings and requirements for lms and cms to support file upload
updating ora2 version
Updating AWS settings
Fix i18n bug on Studio's Advanced Settings page

STUD-1955

HTML escaped localized text that was output to
JavaScript.
Merge pull request #4345 from edx/andy/fix-i18n-bug

Fix i18n bug on Studio's Advanced Settings page
Fix bug in inline discussion post creation

Commit 994ccd1 contained a bug that caused new posts created via the
courseware interface to not get posted to the correct topic. They would
appear to work but would actually be posted to the "undefined" topic.
This has now been fixed.

JIRA: FOR-154
Merge pull request #4350 from edx/gprice/for-154

Fix bug in inline discussion post creation
LMS-2947 remove get_error_courses in Split.
LMS-2950 move delete_course to Mongo.
Fix all modulestore calls to pass in user ids.
Update tests to allow LMS tests to use published branch setting.

Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
Merge pull request #4339 from edx/nimisha/fix-user-ids

Nimisha/fix user ids and LMS tests branch setting
CMS Video Handout Tests
Merge pull request #4307 from edx/ammar/bok-choy-video-handout-tests

CMS Video Handout Tests