diff --git a/pkg/authorization/api/deep_copy_generated.go b/pkg/authorization/api/deep_copy_generated.go
index 6180d15367b6..20afd7be9cf8 100644
--- a/pkg/authorization/api/deep_copy_generated.go
+++ b/pkg/authorization/api/deep_copy_generated.go
@@ -77,7 +77,7 @@ func DeepCopy_api_ClusterPolicy(in ClusterPolicy, out *ClusterPolicy, c *convers
 	}
 	if in.Roles != nil {
 		in, out := in.Roles, &out.Roles
-		*out = make(map[string]*ClusterRole)
+		*out = make(ClusterRolesByName)
 		for key, val := range in {
 			if newVal, err := c.DeepCopy(val); err != nil {
 				return err
@@ -106,7 +106,7 @@ func DeepCopy_api_ClusterPolicyBinding(in ClusterPolicyBinding, out *ClusterPoli
 	}
 	if in.RoleBindings != nil {
 		in, out := in.RoleBindings, &out.RoleBindings
-		*out = make(map[string]*ClusterRoleBinding)
+		*out = make(ClusterRoleBindingsByName)
 		for key, val := range in {
 			if newVal, err := c.DeepCopy(val); err != nil {
 				return err
@@ -309,7 +309,7 @@ func DeepCopy_api_Policy(in Policy, out *Policy, c *conversion.Cloner) error {
 	}
 	if in.Roles != nil {
 		in, out := in.Roles, &out.Roles
-		*out = make(map[string]*Role)
+		*out = make(RolesByName)
 		for key, val := range in {
 			if newVal, err := c.DeepCopy(val); err != nil {
 				return err
@@ -338,7 +338,7 @@ func DeepCopy_api_PolicyBinding(in PolicyBinding, out *PolicyBinding, c *convers
 	}
 	if in.RoleBindings != nil {
 		in, out := in.RoleBindings, &out.RoleBindings
-		*out = make(map[string]*RoleBinding)
+		*out = make(RoleBindingsByName)
 		for key, val := range in {
 			if newVal, err := c.DeepCopy(val); err != nil {
 				return err
diff --git a/pkg/authorization/api/v1/conversion_generated.go b/pkg/authorization/api/v1/conversion_generated.go
index 3f5bf9649474..133743a2d89d 100644
--- a/pkg/authorization/api/v1/conversion_generated.go
+++ b/pkg/authorization/api/v1/conversion_generated.go
@@ -783,6 +783,7 @@ func autoConvert_v1_ResourceAccessReviewResponse_To_api_ResourceAccessReviewResp
 		return err
 	}
 	out.Namespace = in.Namespace
+	out.EvaluationError = in.EvaluationError
 	return nil
 }
 
@@ -791,6 +792,7 @@ func autoConvert_api_ResourceAccessReviewResponse_To_v1_ResourceAccessReviewResp
 		return err
 	}
 	out.Namespace = in.Namespace
+	out.EvaluationError = in.EvaluationError
 	return nil
 }
 
diff --git a/pkg/authorization/api/v1/deep_copy_generated.go b/pkg/authorization/api/v1/deep_copy_generated.go
index 5b5495305959..462e2f03cdb2 100644
--- a/pkg/authorization/api/v1/deep_copy_generated.go
+++ b/pkg/authorization/api/v1/deep_copy_generated.go
@@ -77,7 +77,7 @@ func DeepCopy_v1_ClusterPolicy(in ClusterPolicy, out *ClusterPolicy, c *conversi
 	}
 	if in.Roles != nil {
 		in, out := in.Roles, &out.Roles
-		*out = make([]NamedClusterRole, len(in))
+		*out = make(NamedClusterRoles, len(in))
 		for i := range in {
 			if err := DeepCopy_v1_NamedClusterRole(in[i], &(*out)[i], c); err != nil {
 				return err
@@ -104,7 +104,7 @@ func DeepCopy_v1_ClusterPolicyBinding(in ClusterPolicyBinding, out *ClusterPolic
 	}
 	if in.RoleBindings != nil {
 		in, out := in.RoleBindings, &out.RoleBindings
-		*out = make([]NamedClusterRoleBinding, len(in))
+		*out = make(NamedClusterRoleBindings, len(in))
 		for i := range in {
 			if err := DeepCopy_v1_NamedClusterRoleBinding(in[i], &(*out)[i], c); err != nil {
 				return err
@@ -345,7 +345,7 @@ func DeepCopy_v1_Policy(in Policy, out *Policy, c *conversion.Cloner) error {
 	}
 	if in.Roles != nil {
 		in, out := in.Roles, &out.Roles
-		*out = make([]NamedRole, len(in))
+		*out = make(NamedRoles, len(in))
 		for i := range in {
 			if err := DeepCopy_v1_NamedRole(in[i], &(*out)[i], c); err != nil {
 				return err
@@ -372,7 +372,7 @@ func DeepCopy_v1_PolicyBinding(in PolicyBinding, out *PolicyBinding, c *conversi
 	}
 	if in.RoleBindings != nil {
 		in, out := in.RoleBindings, &out.RoleBindings
-		*out = make([]NamedRoleBinding, len(in))
+		*out = make(NamedRoleBindings, len(in))
 		for i := range in {
 			if err := DeepCopy_v1_NamedRoleBinding(in[i], &(*out)[i], c); err != nil {
 				return err
diff --git a/pkg/authorization/api/v1/generated.proto b/pkg/authorization/api/v1/generated.proto
index f7af45d666cd..eabc94369e6c 100644
--- a/pkg/authorization/api/v1/generated.proto
+++ b/pkg/authorization/api/v1/generated.proto
@@ -103,9 +103,11 @@ message ClusterRoleBinding {
   optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
 
   // UserNames holds all the usernames directly bound to the role
+  // +genconversion=false
   optional OptionalNames userNames = 2;
 
   // GroupNames holds all the groups directly bound to the role
+  // +genconversion=false
   optional OptionalNames groupNames = 3;
 
   // Subjects hold object references to authorize with this rule
@@ -329,9 +331,11 @@ message RoleBinding {
   optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
 
   // UserNames holds all the usernames directly bound to the role
+  // +genconversion=false
   optional OptionalNames userNames = 2;
 
   // GroupNames holds all the groups directly bound to the role
+  // +genconversion=false
   optional OptionalNames groupNames = 3;
 
   // Subjects hold object references to authorize with this rule
diff --git a/pkg/deploy/api/v1/swagger_doc.go b/pkg/deploy/api/v1/swagger_doc.go
index ffa080742f40..70e9200eb67d 100644
--- a/pkg/deploy/api/v1/swagger_doc.go
+++ b/pkg/deploy/api/v1/swagger_doc.go
@@ -85,7 +85,7 @@ var map_DeploymentConfigSpec = map[string]string{
 	"":                     "DeploymentConfigSpec represents the desired state of the deployment.",
 	"strategy":             "Strategy describes how a deployment is executed.",
 	"minReadySeconds":      "MinReadySeconds is the minimum number of seconds for which a newly created pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)",
-	"triggers":             "Triggers determine how updates to a DeploymentConfig result in new deployments. If no triggers are defined, a new deployment can only occur as a result of an explicit client update to the DeploymentConfig with a new LatestVersion.",
+	"triggers":             "Triggers determine how updates to a DeploymentConfig result in new deployments. If no triggers are defined, a new deployment can only occur as a result of an explicit client update to the DeploymentConfig with a new LatestVersion. If null, defaults to having a config change trigger.",
 	"replicas":             "Replicas is the number of desired replicas.",
 	"revisionHistoryLimit": "RevisionHistoryLimit is the number of old ReplicationControllers to retain to allow for rollbacks. This field is a pointer to allow for differentiation between an explicit zero and not specified.",
 	"test":                 "Test ensures that this deployment config will have zero replicas except while a deployment is running. This allows the deployment config to be used as a continuous deployment test - triggering on images, running the deployment, and then succeeding or failing. Post strategy hooks and After actions can be used to integrate successful deployment with an action.",