[Engine-1.21] All bootstrap backport (#4451)

Add ability to reconcile bootstrap data between datastore and disk (#3398)

pkg/cluster/https.go

@@ -79,7 +79,8 @@ func (c *Cluster) initClusterAndHTTPS(ctx context.Context) error {
 
 	// Create a HTTP server with the registered request handlers, using logrus for logging
 	server := http.Server{
-		Handler: handler}
+		Handler: handler,
+	}
 
 	if logrus.IsLevelEnabled(logrus.DebugLevel) {
 		server.ErrorLog = log.New(logrus.StandardLogger().Writer(), "Cluster-Http-Server ", log.LstdFlags)