Merge "RBAC tests for extended server attributes policies"