Merge "Clean up rbac_rule_validation unit tests"