Merge "Clean up test_admin_password_rbac"