Fixes for MOB-836 and MOB-766 and MA-96.

https://edx-wiki.atlassian.net/browse/MOB-836
https://edx-wiki.atlassian.net/browse/MOB-766
https://openedx.atlassian.net/browse/MA-96

PR against release.
Reviewed against master here: https://github.com/edx/edx-platform/pull/5733

FYI @ormsbee and @waheedahmed. This PR is against the release branch so we can hotfix these.  Thanks.