#330983 by recidive and boombatower: Rename users/users_roles tables to user/user_role for consistency.