Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations
