Merge "Enable placement scope and new defaults in rbac test job"