merged upstream
fixed user_controller and admin_user_controller tests