Merge "Additional port-related RBAC tests"