Migrations: Resolve head conflicts.

Make 124e522c8536_add_roles_relationship_to_users
the very tail of the linked list of migrations.