Merge branch 'master' into post-metadata

utils/config.go

@@ -690,6 +690,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
 
 		if *license.Features.CustomTermsOfService {
 			props["EnableCustomTermsOfService"] = strconv.FormatBool(*c.SupportSettings.CustomTermsOfServiceEnabled)
+			props["CustomTermsOfServiceReAcceptancePeriod"] = strconv.FormatInt(int64(*c.SupportSettings.CustomTermsOfServiceReAcceptancePeriod), 10)
 		}
 	}
 

utils/testutils/mocked_http_service.go

@@ -4,9 +4,10 @@
 package testutils
 
 import (
-	"github.com/mattermost/mattermost-server/services/httpservice"
 	"net/http"
 	"net/http/httptest"
+
+	"github.com/mattermost/mattermost-server/services/httpservice"
 )
 
 type MockedHTTPService struct {