diff --git a/ambari-server/docs/api/generated/index.html b/ambari-server/docs/api/generated/index.html
index 690154f..239cfda 100644
--- a/ambari-server/docs/api/generated/index.html
+++ b/ambari-server/docs/api/generated/index.html
@@ -890,6 +890,13 @@
     defs.AlertGroup = {
   "type" : "object",
   "properties" : {
+    "name" : {
+      "type" : "string"
+    },
+    "cluster_id" : {
+      "type" : "integer",
+      "format" : "int64"
+    },
     "default" : {
       "type" : "boolean",
       "default" : false
@@ -897,32 +904,12 @@
     "id" : {
       "type" : "integer",
       "format" : "int64"
-    },
-    "name" : {
-      "type" : "string"
-    },
-    "cluster_id" : {
-      "type" : "integer",
-      "format" : "int64"
     }
   }
 };
     defs.AlertTargetInfo = {
   "type" : "object",
   "properties" : {
-    "name" : {
-      "type" : "string"
-    },
-    "properties" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "string"
-      }
-    },
-    "id" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
     "enabled" : {
       "type" : "boolean",
       "default" : false
@@ -948,6 +935,19 @@
     "global" : {
       "type" : "boolean",
       "default" : false
+    },
+    "name" : {
+      "type" : "string"
+    },
+    "properties" : {
+      "type" : "object",
+      "additionalProperties" : {
+        "type" : "string"
+      }
+    },
+    "id" : {
+      "type" : "integer",
+      "format" : "int64"
     }
   }
 };
@@ -979,10 +979,10 @@
     "service_name" : {
       "type" : "string"
     },
-    "artifact_name" : {
+    "stack_name" : {
       "type" : "string"
     },
-    "stack_name" : {
+    "artifact_name" : {
       "type" : "string"
     }
   }
@@ -1004,45 +1004,45 @@
     defs.BatchRequestRequest = {
   "type" : "object",
   "properties" : {
-    "type" : {
+    "RequestBodyInfo" : {
+      "$ref" : "#/definitions/RequestBodyInfo"
+    },
+    "uri" : {
       "type" : "string"
     },
     "order_id" : {
       "type" : "integer",
       "format" : "int64"
     },
-    "uri" : {
+    "type" : {
       "type" : "string"
-    },
-    "RequestBodyInfo" : {
-      "$ref" : "#/definitions/RequestBodyInfo"
     }
   }
 };
     defs.BatchRequestResponse = {
   "type" : "object",
   "properties" : {
-    "request_type" : {
+    "request_status" : {
       "type" : "string"
     },
     "request_body" : {
       "type" : "string"
     },
-    "request_status" : {
+    "request_uri" : {
       "type" : "string"
     },
     "return_code" : {
       "type" : "integer",
       "format" : "int32"
     },
+    "response_message" : {
+      "type" : "string"
+    },
     "order_id" : {
       "type" : "integer",
       "format" : "int64"
     },
-    "response_message" : {
-      "type" : "string"
-    },
-    "request_uri" : {
+    "request_type" : {
       "type" : "string"
     }
   }
@@ -1407,17 +1407,17 @@
     "stack_name" : {
       "type" : "string"
     },
-    "dependent_component_name" : {
-      "type" : "string"
-    },
-    "dependent_service_name" : {
-      "type" : "string"
-    },
     "conditions" : {
       "type" : "array",
       "items" : {
         "$ref" : "#/definitions/DependencyConditionInfo"
       }
+    },
+    "dependent_component_name" : {
+      "type" : "string"
+    },
+    "dependent_service_name" : {
+      "type" : "string"
     }
   }
 };
@@ -1455,15 +1455,6 @@
       "type" : "integer",
       "format" : "int64"
     },
-    "properties" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "string"
-      }
-    },
-    "type" : {
-      "type" : "string"
-    },
     "tag" : {
       "type" : "string"
     },
@@ -1495,6 +1486,15 @@
           "type" : "string"
         }
       }
+    },
+    "properties" : {
+      "type" : "object",
+      "additionalProperties" : {
+        "type" : "string"
+      }
+    },
+    "type" : {
+      "type" : "string"
     }
   }
 };
@@ -1671,12 +1671,6 @@
       "type" : "integer",
       "format" : "int64"
     },
-    "properties" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "string"
-      }
-    },
     "tag" : {
       "type" : "string"
     },
@@ -1688,6 +1682,12 @@
           "type" : "string"
         }
       }
+    },
+    "properties" : {
+      "type" : "object",
+      "additionalProperties" : {
+        "type" : "string"
+      }
     }
   }
 };
@@ -1731,21 +1731,18 @@
   "type" : "object",
   "required" : [ "authentication_type", "key" ],
   "properties" : {
-    "key" : {
-      "type" : "string"
-    },
     "authentication_type" : {
       "type" : "string",
       "enum" : [ "LOCAL", "LDAP", "JWT", "PAM", "KERBEROS" ]
+    },
+    "key" : {
+      "type" : "string"
     }
   }
 };
     defs.CreateUserInfo = {
   "type" : "object",
   "properties" : {
-    "display_name" : {
-      "type" : "string"
-    },
     "active" : {
       "type" : "boolean",
       "default" : false
@@ -1759,15 +1756,15 @@
     },
     "local_user_name" : {
       "type" : "string"
+    },
+    "display_name" : {
+      "type" : "string"
     }
   }
 };
     defs.CreateUsersInfo = {
   "type" : "object",
   "properties" : {
-    "display_name" : {
-      "type" : "string"
-    },
     "active" : {
       "type" : "boolean",
       "default" : false
@@ -1784,6 +1781,9 @@
     },
     "local_user_name" : {
       "type" : "string"
+    },
+    "display_name" : {
+      "type" : "string"
     }
   }
 };
@@ -1814,10 +1814,10 @@
     defs.Directory = {
   "type" : "object",
   "properties" : {
-    "name" : {
+    "type" : {
       "type" : "string"
     },
-    "type" : {
+    "name" : {
       "type" : "string"
     }
   }
@@ -2042,9 +2042,6 @@
     defs.HostComponentSwagger = {
   "type" : "object",
   "properties" : {
-    "host" : {
-      "$ref" : "#/definitions/HostComponentHost"
-    },
     "component" : {
       "type" : "array",
       "items" : {
@@ -2062,6 +2059,9 @@
     },
     "metrics" : {
       "$ref" : "#/definitions/HostComponentMetrics"
+    },
+    "host" : {
+      "$ref" : "#/definitions/HostComponentHost"
     }
   }
 };
@@ -2098,12 +2098,12 @@
         }
       }
     },
-    "name" : {
-      "type" : "string"
-    },
     "cardinality" : {
       "type" : "integer",
       "format" : "int32"
+    },
+    "name" : {
+      "type" : "string"
     }
   }
 };
@@ -2135,10 +2135,10 @@
     defs.HostOverride = {
   "type" : "object",
   "properties" : {
-    "name" : {
+    "versionTag" : {
       "type" : "string"
     },
-    "versionTag" : {
+    "name" : {
       "type" : "string"
     }
   }
@@ -2164,10 +2164,10 @@
     "public_host_name" : {
       "type" : "string"
     },
-    "blueprint" : {
+    "host_group" : {
       "type" : "string"
     },
-    "host_group" : {
+    "blueprint" : {
       "type" : "string"
     }
   }
@@ -2343,14 +2343,14 @@
     defs.LiveService = {
   "type" : "object",
   "properties" : {
-    "name" : {
-      "type" : "string"
-    },
     "status" : {
       "type" : "string"
     },
     "desc" : {
       "type" : "string"
+    },
+    "name" : {
+      "type" : "string"
     }
   }
 };
@@ -2420,10 +2420,10 @@
     "version" : {
       "type" : "string"
     },
-    "name" : {
+    "repoName" : {
       "type" : "string"
     },
-    "repoName" : {
+    "name" : {
       "type" : "string"
     }
   }
@@ -2593,13 +2593,6 @@
     defs.QuickLinksResponseInfo = {
   "type" : "object",
   "properties" : {
-    "default" : {
-      "type" : "boolean",
-      "default" : false
-    },
-    "file_name" : {
-      "type" : "string"
-    },
     "stack_version" : {
       "type" : "string"
     },
@@ -2611,6 +2604,13 @@
     },
     "quicklink_data" : {
       "$ref" : "#/definitions/QuickLinksConfiguration"
+    },
+    "default" : {
+      "type" : "boolean",
+      "default" : false
+    },
+    "file_name" : {
+      "type" : "string"
     }
   }
 };
@@ -2882,10 +2882,6 @@
         "$ref" : "#/definitions/RepositoryVersionEntity"
       }
     },
-    "hidden" : {
-      "type" : "boolean",
-      "default" : false
-    },
     "stackVersion" : {
       "type" : "string"
     },
@@ -2898,6 +2894,10 @@
     "repositoryXml" : {
       "$ref" : "#/definitions/VersionDefinitionXml"
     },
+    "hidden" : {
+      "type" : "boolean",
+      "default" : false
+    },
     "legacy" : {
       "type" : "boolean",
       "default" : false
@@ -2950,50 +2950,50 @@
     "cluster_name" : {
       "type" : "string"
     },
+    "exclusive" : {
+      "type" : "boolean",
+      "default" : false
+    },
     "resource_filters" : {
       "type" : "array",
       "items" : {
         "$ref" : "#/definitions/RequestResourceFilter"
       }
-    },
-    "exclusive" : {
-      "type" : "boolean",
-      "default" : false
     }
   }
 };
     defs.RequestBodyInfo = {
   "type" : "object",
   "properties" : {
+    "RequestInfo" : {
+      "$ref" : "#/definitions/RequestInfo"
+    },
     "Requests/resource_filters" : {
       "type" : "array",
       "items" : {
         "$ref" : "#/definitions/RequestResourceFilter"
       }
-    },
-    "RequestInfo" : {
-      "$ref" : "#/definitions/RequestInfo"
     }
   }
 };
     defs.RequestInfo = {
   "type" : "object",
   "properties" : {
+    "command" : {
+      "type" : "string"
+    },
+    "action" : {
+      "type" : "string"
+    },
+    "operation_level" : {
+      "$ref" : "#/definitions/OperationLevel"
+    },
     "parameters" : {
       "type" : "object",
       "additionalProperties" : {
         "type" : "object",
         "properties" : { }
       }
-    },
-    "action" : {
-      "type" : "string"
-    },
-    "command" : {
-      "type" : "string"
-    },
-    "operation_level" : {
-      "$ref" : "#/definitions/OperationLevel"
     }
   }
 };
@@ -3050,17 +3050,17 @@
     defs.RequestResourceFilter = {
   "type" : "object",
   "properties" : {
-    "hosts" : {
+    "serviceName" : {
       "type" : "string"
     },
-    "service_name" : {
+    "componentName" : {
       "type" : "string"
     },
-    "component_name" : {
-      "type" : "string"
-    },
-    "hosts_predicate" : {
-      "type" : "string"
+    "hostNames" : {
+      "type" : "array",
+      "items" : {
+        "type" : "string"
+      }
     }
   }
 };
@@ -3100,16 +3100,30 @@
     "schedule" : {
       "$ref" : "#/definitions/ScheduleResponse"
     },
-    "id" : {
-      "type" : "integer",
-      "format" : "int64"
-    },
     "description" : {
       "type" : "string"
     },
     "status" : {
       "type" : "string"
     },
+    "cluster_name" : {
+      "type" : "string"
+    },
+    "create_time" : {
+      "type" : "string"
+    },
+    "batch" : {
+      "$ref" : "#/definitions/BatchResponse"
+    },
+    "create_user" : {
+      "type" : "string"
+    },
+    "update_user" : {
+      "type" : "string"
+    },
+    "update_time" : {
+      "type" : "string"
+    },
     "last_execution_status" : {
       "type" : "string"
     },
@@ -3117,23 +3131,9 @@
       "type" : "integer",
       "format" : "int32"
     },
-    "batch" : {
-      "$ref" : "#/definitions/BatchResponse"
-    },
-    "cluster_name" : {
-      "type" : "string"
-    },
-    "create_time" : {
-      "type" : "string"
-    },
-    "update_time" : {
-      "type" : "string"
-    },
-    "create_user" : {
-      "type" : "string"
-    },
-    "update_user" : {
-      "type" : "string"
+    "id" : {
+      "type" : "integer",
+      "format" : "int64"
     }
   }
 };
@@ -3155,9 +3155,6 @@
     "completed_task_count" : {
       "type" : "string"
     },
-    "type" : {
-      "type" : "string"
-    },
     "start_time" : {
       "type" : "string"
     },
@@ -3167,12 +3164,6 @@
     "request_status" : {
       "type" : "string"
     },
-    "id" : {
-      "type" : "string"
-    },
-    "end_time" : {
-      "type" : "string"
-    },
     "request_schedule" : {
       "type" : "string"
     },
@@ -3183,30 +3174,30 @@
       "type" : "integer",
       "format" : "int64"
     },
-    "inputs" : {
+    "id" : {
       "type" : "string"
     },
-    "operation_level" : {
-      "type" : "string"
-    },
-    "resource_filters" : {
-      "type" : "array",
-      "items" : {
-        "$ref" : "#/definitions/RequestResourceFilter"
-      }
-    },
-    "exclusive" : {
-      "type" : "boolean",
-      "default" : false
-    },
     "aborted_task_count" : {
       "type" : "integer",
       "format" : "int32"
     },
+    "end_time" : {
+      "type" : "string"
+    },
+    "exclusive" : {
+      "type" : "boolean",
+      "default" : false
+    },
     "failed_task_count" : {
       "type" : "integer",
       "format" : "int32"
     },
+    "inputs" : {
+      "type" : "string"
+    },
+    "operation_level" : {
+      "type" : "string"
+    },
     "progress_percent" : {
       "type" : "number",
       "format" : "double"
@@ -3218,26 +3209,35 @@
     "request_schedule_id" : {
       "type" : "integer",
       "format" : "int64"
+    },
+    "resource_filters" : {
+      "type" : "array",
+      "items" : {
+        "$ref" : "#/definitions/RequestResourceFilter"
+      }
+    },
+    "type" : {
+      "type" : "string"
     }
   }
 };
     defs.RootServiceComponentConfigurationRequestInfo = {
   "type" : "object",
   "properties" : {
-    "properties" : {
-      "type" : "object",
-      "additionalProperties" : {
-        "type" : "string"
-      }
-    },
-    "categoryName" : {
-      "type" : "string"
-    },
     "serviceName" : {
       "type" : "string"
     },
     "componentName" : {
       "type" : "string"
+    },
+    "categoryName" : {
+      "type" : "string"
+    },
+    "properties" : {
+      "type" : "object",
+      "additionalProperties" : {
+        "type" : "string"
+      }
     }
   }
 };
@@ -3252,21 +3252,21 @@
     defs.RootServiceComponentConfigurationResponseInfo = {
   "type" : "object",
   "properties" : {
+    "serviceName" : {
+      "type" : "string"
+    },
+    "componentName" : {
+      "type" : "string"
+    },
+    "categoryName" : {
+      "type" : "string"
+    },
     "properties" : {
       "type" : "object",
       "additionalProperties" : {
         "type" : "object",
         "properties" : { }
       }
-    },
-    "categoryName" : {
-      "type" : "string"
-    },
-    "serviceName" : {
-      "type" : "string"
-    },
-    "componentName" : {
-      "type" : "string"
     }
   }
 };
@@ -3391,6 +3391,9 @@
     defs.ScheduleRequest = {
   "type" : "object",
   "properties" : {
+    "year" : {
+      "type" : "string"
+    },
     "day_of_week" : {
       "type" : "string"
     },
@@ -3403,16 +3406,13 @@
     "minutes" : {
       "type" : "string"
     },
-    "year" : {
-      "type" : "string"
-    },
     "startTime" : {
       "type" : "string"
     },
-    "days_of_month" : {
+    "endTime" : {
       "type" : "string"
     },
-    "endTime" : {
+    "days_of_month" : {
       "type" : "string"
     }
   }
@@ -3420,6 +3420,9 @@
     defs.ScheduleResponse = {
   "type" : "object",
   "properties" : {
+    "year" : {
+      "type" : "string"
+    },
     "day_of_week" : {
       "type" : "string"
     },
@@ -3432,16 +3435,13 @@
     "minutes" : {
       "type" : "string"
     },
-    "year" : {
-      "type" : "string"
-    },
     "start_time" : {
       "type" : "string"
     },
-    "days_of_month" : {
+    "end_time" : {
       "type" : "string"
     },
-    "end_time" : {
+    "days_of_month" : {
       "type" : "string"
     }
   }
@@ -3807,12 +3807,12 @@
     defs.ShortRequestInfo = {
   "type" : "object",
   "properties" : {
+    "status" : {
+      "type" : "string"
+    },
     "id" : {
       "type" : "integer",
       "format" : "int64"
-    },
-    "status" : {
-      "type" : "string"
     }
   }
 };
@@ -4038,10 +4038,6 @@
     "bulk_commands_master_component_namen" : {
       "type" : "string"
     },
-    "is_client" : {
-      "type" : "boolean",
-      "default" : false
-    },
     "decommission_allowed" : {
       "type" : "boolean",
       "default" : false
@@ -4049,6 +4045,10 @@
     "reassign_allowed" : {
       "type" : "boolean",
       "default" : false
+    },
+    "is_client" : {
+      "type" : "boolean",
+      "default" : false
     }
   }
 };
@@ -4350,13 +4350,6 @@
     defs.ThemeInfoResponse = {
   "type" : "object",
   "properties" : {
-    "default" : {
-      "type" : "boolean",
-      "default" : false
-    },
-    "file_name" : {
-      "type" : "string"
-    },
     "stack_version" : {
       "type" : "string"
     },
@@ -4368,6 +4361,13 @@
     },
     "theme_data" : {
       "$ref" : "#/definitions/Theme"
+    },
+    "default" : {
+      "type" : "boolean",
+      "default" : false
+    },
+    "file_name" : {
+      "type" : "string"
     }
   }
 };
@@ -4390,9 +4390,6 @@
     defs.UpdateUserInfo = {
   "type" : "object",
   "properties" : {
-    "display_name" : {
-      "type" : "string"
-    },
     "active" : {
       "type" : "boolean",
       "default" : false
@@ -4404,10 +4401,13 @@
       "type" : "boolean",
       "default" : false
     },
+    "local_user_name" : {
+      "type" : "string"
+    },
     "old_password" : {
       "type" : "string"
     },
-    "local_user_name" : {
+    "display_name" : {
       "type" : "string"
     }
   }
@@ -4424,10 +4424,10 @@
   "type" : "object",
   "required" : [ "key" ],
   "properties" : {
-    "key" : {
+    "old_key" : {
       "type" : "string"
     },
-    "old_key" : {
+    "key" : {
       "type" : "string"
     }
   }
@@ -4974,13 +4974,13 @@
     "view_instance_name" : {
       "type" : "string"
     },
-    "url_suffix" : {
+    "view_instance_common_name" : {
       "type" : "string"
     },
     "view_instance_version" : {
       "type" : "string"
     },
-    "view_instance_common_name" : {
+    "url_suffix" : {
       "type" : "string"
     },
     "url_name" : {
@@ -75927,7 +75927,7 @@
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2019-12-12T17:59:39.030+02:00
+              Generated 2021-11-02T16:34:34.665+01:00
             </div>
           </div>
       </div>
diff --git a/ambari-server/docs/api/generated/swagger.json b/ambari-server/docs/api/generated/swagger.json
index 6b1097e..fb95d71 100644
--- a/ambari-server/docs/api/generated/swagger.json
+++ b/ambari-server/docs/api/generated/swagger.json
@@ -17,6 +17,9 @@
     "name" : "Alerts",
     "description" : "Endpoint for alert specific operations"
   }, {
+    "name" : "Auth",
+    "description" : "Endpoint for authentication operations"
+  }, {
     "name" : "Blueprints",
     "description" : "Endpoint for blueprint specific operations"
   }, {
@@ -517,6 +520,40 @@
         }
       }
     },
+    "/auth" : {
+      "post" : {
+        "tags" : [ "Auth" ],
+        "summary" : "User authorization request",
+        "description" : "",
+        "operationId" : "getUsersViaPost",
+        "produces" : [ "text/plain" ],
+        "parameters" : [ {
+          "in" : "body",
+          "name" : "body",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/AuthRequestCreateAuthSwagger"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid arguments"
+          },
+          "401" : {
+            "description" : "Not authenticated"
+          },
+          "403" : {
+            "description" : "Not permitted to perform the operation"
+          },
+          "404" : {
+            "description" : "The requested resource doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
     "/blueprints" : {
       "get" : {
         "tags" : [ "Blueprints" ],
@@ -8418,10 +8455,6 @@
         "name" : {
           "type" : "string"
         },
-        "cluster_id" : {
-          "type" : "integer",
-          "format" : "int64"
-        },
         "default" : {
           "type" : "boolean",
           "default" : false
@@ -8429,6 +8462,10 @@
         "id" : {
           "type" : "integer",
           "format" : "int64"
+        },
+        "cluster_id" : {
+          "type" : "integer",
+          "format" : "int64"
         }
       }
     },
@@ -8442,25 +8479,6 @@
         "description" : {
           "type" : "string"
         },
-        "groups" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/AlertGroup"
-          }
-        },
-        "notification_type" : {
-          "type" : "string"
-        },
-        "alert_states" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "global" : {
-          "type" : "boolean",
-          "default" : false
-        },
         "name" : {
           "type" : "string"
         },
@@ -8473,6 +8491,25 @@
         "id" : {
           "type" : "integer",
           "format" : "int64"
+        },
+        "alert_states" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "global" : {
+          "type" : "boolean",
+          "default" : false
+        },
+        "notification_type" : {
+          "type" : "string"
+        },
+        "groups" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/AlertGroup"
+          }
         }
       }
     },
@@ -8512,6 +8549,9 @@
         }
       }
     },
+    "AuthRequestCreateAuthSwagger" : {
+      "type" : "object"
+    },
     "BatchRequest" : {
       "type" : "object",
       "properties" : {
@@ -8529,8 +8569,8 @@
     "BatchRequestRequest" : {
       "type" : "object",
       "properties" : {
-        "RequestBodyInfo" : {
-          "$ref" : "#/definitions/RequestBodyInfo"
+        "type" : {
+          "type" : "string"
         },
         "uri" : {
           "type" : "string"
@@ -8539,8 +8579,8 @@
           "type" : "integer",
           "format" : "int64"
         },
-        "type" : {
-          "type" : "string"
+        "RequestBodyInfo" : {
+          "$ref" : "#/definitions/RequestBodyInfo"
         }
       }
     },
@@ -8553,21 +8593,21 @@
         "request_body" : {
           "type" : "string"
         },
-        "request_uri" : {
+        "request_type" : {
           "type" : "string"
         },
-        "return_code" : {
-          "type" : "integer",
-          "format" : "int32"
-        },
-        "response_message" : {
+        "request_uri" : {
           "type" : "string"
         },
         "order_id" : {
           "type" : "integer",
           "format" : "int64"
         },
-        "request_type" : {
+        "return_code" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "response_message" : {
           "type" : "string"
         }
       }
@@ -8602,9 +8642,6 @@
     "BlueprintInfo" : {
       "type" : "object",
       "properties" : {
-        "security" : {
-          "$ref" : "#/definitions/SecurityInfo"
-        },
         "stack_version" : {
           "type" : "string"
         },
@@ -8613,6 +8650,9 @@
         },
         "blueprint_name" : {
           "type" : "string"
+        },
+        "security" : {
+          "$ref" : "#/definitions/SecurityInfo"
         }
       }
     },
@@ -8686,14 +8726,14 @@
     "ClusterArtifactResponse" : {
       "type" : "object",
       "properties" : {
+        "Artifacts" : {
+          "$ref" : "#/definitions/ClusterArtifactResponseInfo"
+        },
         "artifact_data" : {
           "type" : "object",
           "additionalProperties" : {
             "type" : "object"
           }
-        },
-        "Artifacts" : {
-          "$ref" : "#/definitions/ClusterArtifactResponseInfo"
         }
       }
     },
@@ -8915,18 +8955,6 @@
         "scope" : {
           "type" : "string"
         },
-        "stack_version" : {
-          "type" : "string"
-        },
-        "service_name" : {
-          "type" : "string"
-        },
-        "component_name" : {
-          "type" : "string"
-        },
-        "stack_name" : {
-          "type" : "string"
-        },
         "conditions" : {
           "type" : "array",
           "items" : {
@@ -8938,16 +8966,28 @@
         },
         "dependent_service_name" : {
           "type" : "string"
+        },
+        "stack_version" : {
+          "type" : "string"
+        },
+        "service_name" : {
+          "type" : "string"
+        },
+        "stack_name" : {
+          "type" : "string"
+        },
+        "component_name" : {
+          "type" : "string"
         }
       }
     },
     "ComponentInfo" : {
       "type" : "object",
       "properties" : {
-        "name" : {
+        "provision_action" : {
           "type" : "string"
         },
-        "provision_action" : {
+        "name" : {
           "type" : "string"
         }
       }
@@ -8971,20 +9011,22 @@
     "Config" : {
       "type" : "object",
       "properties" : {
+        "tag" : {
+          "type" : "string"
+        },
         "version" : {
           "type" : "integer",
           "format" : "int64"
         },
-        "tag" : {
-          "type" : "string"
-        },
-        "serviceConfigVersions" : {
-          "type" : "array",
-          "items" : {
-            "type" : "integer",
-            "format" : "int64"
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
           }
         },
+        "type" : {
+          "type" : "string"
+        },
         "stackId" : {
           "$ref" : "#/definitions/StackId"
         },
@@ -9007,14 +9049,12 @@
             }
           }
         },
-        "properties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
+        "serviceConfigVersions" : {
+          "type" : "array",
+          "items" : {
+            "type" : "integer",
+            "format" : "int64"
           }
-        },
-        "type" : {
-          "type" : "string"
         }
       }
     },
@@ -9188,6 +9228,12 @@
           "type" : "integer",
           "format" : "int64"
         },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
         "tag" : {
           "type" : "string"
         },
@@ -9199,12 +9245,6 @@
               "type" : "string"
             }
           }
-        },
-        "properties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
         }
       }
     },
@@ -9271,10 +9311,10 @@
           "type" : "boolean",
           "default" : false
         },
-        "local_user_name" : {
+        "display_name" : {
           "type" : "string"
         },
-        "display_name" : {
+        "local_user_name" : {
           "type" : "string"
         }
       }
@@ -9286,20 +9326,20 @@
           "type" : "boolean",
           "default" : false
         },
-        "user_name" : {
+        "password" : {
           "type" : "string"
         },
-        "password" : {
+        "user_name" : {
           "type" : "string"
         },
         "admin" : {
           "type" : "boolean",
           "default" : false
         },
-        "local_user_name" : {
+        "display_name" : {
           "type" : "string"
         },
-        "display_name" : {
+        "local_user_name" : {
           "type" : "string"
         }
       }
@@ -9500,11 +9540,11 @@
     "HostComponentComponent" : {
       "type" : "object",
       "properties" : {
-        "href" : {
-          "type" : "string"
-        },
         "ServiceComponentInfo" : {
           "$ref" : "#/definitions/HostComponentServiceComponentInfo"
+        },
+        "href" : {
+          "type" : "string"
         }
       }
     },
@@ -9565,11 +9605,8 @@
             "$ref" : "#/definitions/HostComponentComponent"
           }
         },
-        "processes" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/HostComponentProcesses"
-          }
+        "host" : {
+          "$ref" : "#/definitions/HostComponentHost"
         },
         "HostRoles" : {
           "$ref" : "#/definitions/ServiceComponentHostResponse"
@@ -9577,8 +9614,11 @@
         "metrics" : {
           "$ref" : "#/definitions/HostComponentMetrics"
         },
-        "host" : {
-          "$ref" : "#/definitions/HostComponentHost"
+        "processes" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/HostComponentProcesses"
+          }
         }
       }
     },
@@ -9614,12 +9654,12 @@
             }
           }
         },
+        "name" : {
+          "type" : "string"
+        },
         "cardinality" : {
           "type" : "integer",
           "format" : "int32"
-        },
-        "name" : {
-          "type" : "string"
         }
       }
     },
@@ -9651,10 +9691,10 @@
     "HostOverride" : {
       "type" : "object",
       "properties" : {
-        "versionTag" : {
+        "name" : {
           "type" : "string"
         },
-        "name" : {
+        "versionTag" : {
           "type" : "string"
         }
       }
@@ -9677,14 +9717,14 @@
         "maintenance_state" : {
           "type" : "string"
         },
+        "blueprint" : {
+          "type" : "string"
+        },
         "public_host_name" : {
           "type" : "string"
         },
         "host_group" : {
           "type" : "string"
-        },
-        "blueprint" : {
-          "type" : "string"
         }
       }
     },
@@ -9862,10 +9902,10 @@
         "status" : {
           "type" : "string"
         },
-        "desc" : {
+        "name" : {
           "type" : "string"
         },
-        "name" : {
+        "desc" : {
           "type" : "string"
         }
       }
@@ -9936,10 +9976,10 @@
         "version" : {
           "type" : "string"
         },
-        "repoName" : {
+        "name" : {
           "type" : "string"
         },
-        "name" : {
+        "repoName" : {
           "type" : "string"
         }
       }
@@ -10109,6 +10149,13 @@
     "QuickLinksResponseInfo" : {
       "type" : "object",
       "properties" : {
+        "default" : {
+          "type" : "boolean",
+          "default" : false
+        },
+        "file_name" : {
+          "type" : "string"
+        },
         "stack_version" : {
           "type" : "string"
         },
@@ -10120,13 +10167,6 @@
         },
         "quicklink_data" : {
           "$ref" : "#/definitions/QuickLinksConfiguration"
-        },
-        "default" : {
-          "type" : "boolean",
-          "default" : false
-        },
-        "file_name" : {
-          "type" : "string"
         }
       }
     },
@@ -10211,9 +10251,6 @@
             "enum" : [ "GPL" ]
           }
         },
-        "repoName" : {
-          "type" : "string"
-        },
         "baseUrl" : {
           "type" : "string"
         },
@@ -10222,6 +10259,9 @@
         },
         "repoId" : {
           "type" : "string"
+        },
+        "repoName" : {
+          "type" : "string"
         }
       }
     },
@@ -10398,21 +10438,21 @@
             "$ref" : "#/definitions/RepositoryVersionEntity"
           }
         },
-        "stackVersion" : {
-          "type" : "string"
+        "hidden" : {
+          "type" : "boolean",
+          "default" : false
         },
         "stackId" : {
           "$ref" : "#/definitions/StackId"
         },
-        "stackName" : {
-          "type" : "string"
-        },
         "repositoryXml" : {
           "$ref" : "#/definitions/VersionDefinitionXml"
         },
-        "hidden" : {
-          "type" : "boolean",
-          "default" : false
+        "stackVersion" : {
+          "type" : "string"
+        },
+        "stackName" : {
+          "type" : "string"
         },
         "legacy" : {
           "type" : "boolean",
@@ -10495,6 +10535,12 @@
     "RequestInfo" : {
       "type" : "object",
       "properties" : {
+        "parameters" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
         "command" : {
           "type" : "string"
         },
@@ -10503,12 +10549,6 @@
         },
         "operation_level" : {
           "$ref" : "#/definitions/OperationLevel"
-        },
-        "parameters" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "object"
-          }
         }
       }
     },
@@ -10612,19 +10652,23 @@
     "RequestScheduleResponseElement" : {
       "type" : "object",
       "properties" : {
-        "schedule" : {
-          "$ref" : "#/definitions/ScheduleResponse"
+        "status" : {
+          "type" : "string"
         },
         "description" : {
           "type" : "string"
         },
-        "status" : {
-          "type" : "string"
+        "schedule" : {
+          "$ref" : "#/definitions/ScheduleResponse"
+        },
+        "id" : {
+          "type" : "integer",
+          "format" : "int64"
         },
         "cluster_name" : {
           "type" : "string"
         },
-        "create_time" : {
+        "update_time" : {
           "type" : "string"
         },
         "batch" : {
@@ -10636,9 +10680,6 @@
         "update_user" : {
           "type" : "string"
         },
-        "update_time" : {
-          "type" : "string"
-        },
         "last_execution_status" : {
           "type" : "string"
         },
@@ -10646,9 +10687,8 @@
           "type" : "integer",
           "format" : "int32"
         },
-        "id" : {
-          "type" : "integer",
-          "format" : "int64"
+        "create_time" : {
+          "type" : "string"
         }
       }
     },
@@ -10663,6 +10703,15 @@
     "RequestStatusInfo" : {
       "type" : "object",
       "properties" : {
+        "request_context" : {
+          "type" : "string"
+        },
+        "request_status" : {
+          "type" : "string"
+        },
+        "start_time" : {
+          "type" : "string"
+        },
         "task_count" : {
           "type" : "integer",
           "format" : "int32"
@@ -10670,16 +10719,7 @@
         "completed_task_count" : {
           "type" : "string"
         },
-        "start_time" : {
-          "type" : "string"
-        },
-        "request_context" : {
-          "type" : "string"
-        },
-        "request_status" : {
-          "type" : "string"
-        },
-        "request_schedule" : {
+        "type" : {
           "type" : "string"
         },
         "cluster_name" : {
@@ -10689,6 +10729,9 @@
           "type" : "integer",
           "format" : "int64"
         },
+        "request_schedule" : {
+          "type" : "string"
+        },
         "id" : {
           "type" : "string"
         },
@@ -10730,21 +10773,12 @@
           "items" : {
             "$ref" : "#/definitions/RequestResourceFilter"
           }
-        },
-        "type" : {
-          "type" : "string"
         }
       }
     },
     "RootServiceComponentConfigurationRequestInfo" : {
       "type" : "object",
       "properties" : {
-        "serviceName" : {
-          "type" : "string"
-        },
-        "componentName" : {
-          "type" : "string"
-        },
         "categoryName" : {
           "type" : "string"
         },
@@ -10753,6 +10787,12 @@
           "additionalProperties" : {
             "type" : "string"
           }
+        },
+        "serviceName" : {
+          "type" : "string"
+        },
+        "componentName" : {
+          "type" : "string"
         }
       }
     },
@@ -10767,12 +10807,6 @@
     "RootServiceComponentConfigurationResponseInfo" : {
       "type" : "object",
       "properties" : {
-        "serviceName" : {
-          "type" : "string"
-        },
-        "componentName" : {
-          "type" : "string"
-        },
         "categoryName" : {
           "type" : "string"
         },
@@ -10781,6 +10815,12 @@
           "additionalProperties" : {
             "type" : "object"
           }
+        },
+        "serviceName" : {
+          "type" : "string"
+        },
+        "componentName" : {
+          "type" : "string"
         }
       }
     },
@@ -10905,7 +10945,7 @@
     "ScheduleRequest" : {
       "type" : "object",
       "properties" : {
-        "year" : {
+        "startTime" : {
           "type" : "string"
         },
         "day_of_week" : {
@@ -10920,21 +10960,21 @@
         "minutes" : {
           "type" : "string"
         },
-        "startTime" : {
-          "type" : "string"
-        },
-        "endTime" : {
+        "year" : {
           "type" : "string"
         },
         "days_of_month" : {
           "type" : "string"
+        },
+        "endTime" : {
+          "type" : "string"
         }
       }
     },
     "ScheduleResponse" : {
       "type" : "object",
       "properties" : {
-        "year" : {
+        "start_time" : {
           "type" : "string"
         },
         "day_of_week" : {
@@ -10949,14 +10989,14 @@
         "minutes" : {
           "type" : "string"
         },
-        "start_time" : {
-          "type" : "string"
-        },
-        "end_time" : {
+        "year" : {
           "type" : "string"
         },
         "days_of_month" : {
           "type" : "string"
+        },
+        "end_time" : {
+          "type" : "string"
         }
       }
     },
@@ -11008,12 +11048,12 @@
             "type" : "object"
           }
         },
+        "kerberos_descriptor_reference" : {
+          "type" : "string"
+        },
         "security_type" : {
           "type" : "string",
           "enum" : [ "NONE", "KERBEROS" ]
-        },
-        "kerberos_descriptor_reference" : {
-          "type" : "string"
         }
       }
     },
@@ -11549,6 +11589,10 @@
         "bulk_commands_master_component_namen" : {
           "type" : "string"
         },
+        "is_client" : {
+          "type" : "boolean",
+          "default" : false
+        },
         "decommission_allowed" : {
           "type" : "boolean",
           "default" : false
@@ -11556,10 +11600,6 @@
         "reassign_allowed" : {
           "type" : "boolean",
           "default" : false
-        },
-        "is_client" : {
-          "type" : "boolean",
-          "default" : false
         }
       }
     },
@@ -11861,6 +11901,13 @@
     "ThemeInfoResponse" : {
       "type" : "object",
       "properties" : {
+        "default" : {
+          "type" : "boolean",
+          "default" : false
+        },
+        "file_name" : {
+          "type" : "string"
+        },
         "stack_version" : {
           "type" : "string"
         },
@@ -11872,13 +11919,6 @@
         },
         "theme_data" : {
           "$ref" : "#/definitions/Theme"
-        },
-        "default" : {
-          "type" : "boolean",
-          "default" : false
-        },
-        "file_name" : {
-          "type" : "string"
         }
       }
     },
@@ -11912,14 +11952,14 @@
           "type" : "boolean",
           "default" : false
         },
+        "display_name" : {
+          "type" : "string"
+        },
         "local_user_name" : {
           "type" : "string"
         },
         "old_password" : {
           "type" : "string"
-        },
-        "display_name" : {
-          "type" : "string"
         }
       }
     },
@@ -11935,10 +11975,10 @@
       "type" : "object",
       "required" : [ "key" ],
       "properties" : {
-        "old_key" : {
+        "key" : {
           "type" : "string"
         },
-        "key" : {
+        "old_key" : {
           "type" : "string"
         }
       }
@@ -12126,11 +12166,11 @@
         "user_name" : {
           "type" : "string"
         },
-        "ldap_user" : {
+        "admin" : {
           "type" : "boolean",
           "default" : false
         },
-        "admin" : {
+        "ldap_user" : {
           "type" : "boolean",
           "default" : false
         },
@@ -12150,12 +12190,12 @@
     "ValidationResult" : {
       "type" : "object",
       "properties" : {
+        "detail" : {
+          "type" : "string"
+        },
         "valid" : {
           "type" : "boolean",
           "default" : false
-        },
-        "detail" : {
-          "type" : "string"
         }
       }
     },
@@ -12485,16 +12525,16 @@
         "view_instance_name" : {
           "type" : "string"
         },
-        "view_instance_common_name" : {
-          "type" : "string"
-        },
-        "view_instance_version" : {
+        "url_name" : {
           "type" : "string"
         },
         "url_suffix" : {
           "type" : "string"
         },
-        "url_name" : {
+        "view_instance_common_name" : {
+          "type" : "string"
+        },
+        "view_instance_version" : {
           "type" : "string"
         }
       }
diff --git a/ambari-server/docs/configuration/index.md b/ambari-server/docs/configuration/index.md
index ab9f2c6..61fe943 100644
--- a/ambari-server/docs/configuration/index.md
+++ b/ambari-server/docs/configuration/index.md
@@ -115,6 +115,7 @@
 | heartbeat.monitoring.interval | Interval for heartbeat presence checks.<br/><br/>The following are examples of valid values:<ul><li>`60000`<li>`600000`</ul> |`60000` | 
 | http.cache-control | The value that will be used to set the `Cache-Control` HTTP response header. |`no-store` | 
 | http.charset | The value that will be used to set the Character encoding to HTTP response header. |`utf-8` | 
+| http.content-security-policy | The value that will be used to set the `Content-Security-Policy` HTTP response header. | | 
 | http.pragma | The value that will be used to set the `PRAGMA` HTTP response header. |`no-cache` | 
 | http.strict-transport-security | When using SSL, this will be used to set the `Strict-Transport-Security` response header. |`max-age=31536000` | 
 | http.x-content-type-options | The value that will be used to set the `X-CONTENT-TYPE` HTTP response header. |`nosniff` | 
@@ -239,6 +240,8 @@
 | server.os_family | The operating system family for all hosts in the cluster. This is used when bootstrapping agents and when enabling Kerberos.<br/><br/>The following are examples of valid values:<ul><li>`redhat`<li>`ubuntu`</ul> | | 
 | server.os_type | The operating system version for all hosts in the cluster. This is used when bootstrapping agents and when enabling Kerberos.<br/><br/>The following are examples of valid values:<ul><li>`6`<li>`7`</ul> | | 
 | server.persistence.type | The type of database connection being used. Unless using an embedded PostgresSQL server, then this should be `remote`.<br/><br/>The following are examples of valid values:<ul><li>`local`<li>`remote`</ul> |`local` | 
+| server.pools.agent.command.publisher.size | The Agent command publisher pool. Affects degree of parallelization for generating the commands. |`5` | 
+| server.pools.default.size | Configures size of the default JOIN Fork pool used for Streams. |`5` | 
 | server.property-provider.threadpool.completion.timeout | The maximum time, in milliseconds, that federated requests for data can execute before being terminated. Increasing this value could result in degraded performanc from the REST APIs. |`5000` | 
 | server.property-provider.threadpool.size.core | The core number of threads that will be used to retrieve data from federated datasources, such as remote JMX endpoints. |`8` | 
 | server.property-provider.threadpool.size.max | The maximum number of threads that will be used to retrieve data from federated datasources, such as remote JMX endpoints. |`16` | 
@@ -248,6 +251,7 @@
 | server.requestlogs.retaindays | The number of days that request log would be retained. |`15` | 
 | server.script.threads | The number of threads that should be allocated to run external script. |`20` | 
 | server.script.timeout | The time, in milliseconds, until an external script is killed. |`10000` | 
+| server.show.error.stacks | Show or hide the error stacks on the error page |`false` | 
 | server.stage.command.execution_type | How to execute commands in one stage |`STAGE` | 
 | server.stages.parallel | Determines whether operations in different execution requests can be run concurrently. |`true` | 
 | server.startup.web.timeout | The time, in seconds, that the ambari-server Python script will wait for Jetty to startup before returning an error code. |`50` | 
@@ -285,7 +289,6 @@
 | stomp.max_buffer.message.size | The maximum size of a buffer for stomp message sending. Default is 5 MB. |`5242880` | 
 | stomp.max_incoming.message.size | The maximum size of an incoming stomp text message. Default is 2 MB. |`2097152` | 
 | subscription.registry.cache.size | Maximal cache size for spring subscription registry. |`1500` | 
-| task.query.parameterlist.size | The maximum number of tasks which can be queried by ID from the database. |`999` | 
 | topology.task.creation.parallel | Indicates whether parallel topology task creation is enabled |`false` | 
 | topology.task.creation.parallel.threads | The number of threads to use for parallel topology task creation if enabled |`10` | 
 | view.extract-after-cluster-config | Drives view extraction in case of blueprint deployments; non-system views are deployed when cluster configuration is successful |`false` | 
@@ -301,6 +304,7 @@
 | views.directory.watcher.disable | Determines whether the view directory watcher service should be disabled. |`false` | 
 | views.http.cache-control | The value that will be used to set the `Cache-Control` HTTP response header for Ambari View requests. |`no-store` | 
 | views.http.charset | The value that will be used to set the Character encoding to HTTP response header for Ambari View requests. |`utf-8` | 
+| views.http.content-security-policy | The value that will be used to set the `Content-Security-Policy` HTTP response header for Ambari View requests. | | 
 | views.http.pragma | The value that will be used to set the `PRAGMA` HTTP response header for Ambari View requests. |`no-cache` | 
 | views.http.strict-transport-security | The value that will be used to set the `Strict-Transport-Security` HTTP response header for Ambari View requests. |`max-age=31536000` | 
 | views.http.x-content-type-options | The value that will be used to set the `X-CONTENT-TYPE` HTTP response header for Ambari View requests. |`nosniff` |