Merge "UserController.switchUser accepts MANAGE_USERS"