Merge pull request #301 from edx-solutions/master

changes from master to release
Merge pull request #303 from edx-solutions/mattdrayer/api-migrate_transitional_ids

mattdrayer/api-migrate_transitional_ids: Cleaned up two additional table...
mentoring: Update hash
Merge branch 'release' into master