Merge "Add RBAC scope and new defaults setting support for placement"