PLT-6226 Fixing races with licensing (#7213)

* PLT-6226 Fixing races with licensing

* Fixing build issue

* Fixing licensing issue

* removing commented code

utils/license_test.go

@@ -54,14 +54,14 @@ func TestValidateLicense(t *testing.T) {
 func TestClientLicenseEtag(t *testing.T) {
 	etag1 := GetClientLicenseEtag(false)
 
-	ClientLicense["SomeFeature"] = "true"
+	SetClientLicense(map[string]string{"SomeFeature": "true", "IsLicensed": "true"})
 
 	etag2 := GetClientLicenseEtag(false)
 	if etag1 == etag2 {
 		t.Fatal("etags should not match")
 	}
 
-	ClientLicense["SomeFeature"] = "false"
+	SetClientLicense(map[string]string{"SomeFeature": "true", "IsLicensed": "false"})
 
 	etag3 := GetClientLicenseEtag(false)
 	if etag2 == etag3 {