Fix discussion error popup on http request abort
Add course_id as merchant defined data
Cache inherited settings outside of structure
LMS-11363
Test inheritance to new xblocks in same request
Do not call upper on a profile country code of None
Merge pull request #5127 from aboudreault/discussion-request-abort-issue

Fix discussion error popup on http request abort
Merge pull request #5135 from edx/renzo/fix-embargo-middleware-redux

Do not call upper on a profile country code of None
Corrected NameError for invalid variable
Add event tracking endpoint to be called by segment.io
CodeMirror should use monospace fonts.

TNL-197
AWS settings for XBlocks to have filesystem-like storage

Upgrades to latest pyfs to support auth not through environment variables
Merge pull request #5109 from edx/split/inherited_settings

Cache inherited settings outside of structure
Fix embargo middleware with tests
Merge pull request #5101 from mitocw/cg/bugfix/remove_translated_log_messages

Remove some uneeded translation strings in git_export
Merge pull request #5136 from mitocw/cg/bugfix/namerror_legacy

Corrected NameError for invalid variable
Merge pull request #5115 from mitocw/cg/bugfix/add_git_clean

Fixes git export to support repositories with dots in their name and cleans export repo
Merge pull request #5002 from mulby/gabe/add-segmentio-hook

Add event tracking endpoint to be called by segment.io
TE-468 - bok-choy: Fix flakiness in date-picker steps under studio

These were failing on Solano builds because the save button was clicked
before the datepicker was done its work. (The EmptyPromise was still satisfied
because the input field value had been updated, but the datepicker widget
caused issues about 3/4 of the time.)
fixes help copy for annotation settings
LMS: resolves focus background-color issue of 3rd party login buttons