This test is failing in a different test environment (Solano) because
the built html has reversed the order of the width and height attributes
from what we are expecting. This change focuses the assertion to the
pieces that are important (as noted in the unchanged comment above
the assertion).

AWS settings for XBlocks to have filesystem-like storage

Test cohort selector in NewPostView

Update translations (autogenerated message)

Upgrades to latest pyfs to support auth not through environment variables

show upload progress on import course view

Strengthened warnings to remember passphrase. Fixes DOC-860.

@stroilova, @srpearce, please take a look. Fixes DOC-860.

STUD-2017

XBlock argument passing support backport from SDK

Upgrading gunicorn to latest

Adam/resolve merge conflicts

LMS-11357 Split revert_to_publish: correctly revert to Published version

Pylint issues in test_mixed_modulestore.py.

LMS: Accessibility Tweaks 

MaxJax error while submitting answer

Flagging posts in closed thread causes an error

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

LMS-11354 Make Split has_changes check subtree.

Hotfix/2014 09 05b

Fix Video Transcript Test

When the thread is closed user can't able to report
the thread and it gives the error. User can now report
thread even it is closed.

TNL-151

Refrain from accessing country code if country is None

Add i18n extraction test

FIX: Studio - System Feedback Icon Styling

escape html for inline discussions (TNL-182)

Cdodge/white label small hotfixes

Tmporarily disable bulk operations b/c old mongo

Revert "Revert "Merge pull request #4976 from edx/will/ecom-128""

This reverts commit 371dfd61.

Christina/cohorts bok choy