Hotfix candidate branch for building

Hotfix process does not quite account for 2 hotfixes. This branch is to manage the combination of both hotfixes going into stage before any release

Includes changes for:
* https://github.com/edx/edx-platform/pull/5787
and
* https://github.com/edx/edx-platform/pull/5795

These should (in theory) become closed when this PR has been merged into release