Skip test broken on master. Sent to team for review.
Merge pull request #5865 from edx/benp/skip-broken-MA-117

Skip test broken on master. Sent to team for review.
Fix broken test (due to merge conflict).
Merge pull request #5867 from edx/mobile/fix-broken-master

Fix mobile_api broken test (due to merge conflict).