Merge "Fix failing v2 identity user tests by adding admin_only kwarg."