Merge branch 'main' into qa

smardigo/template/roles/roles.json

@@ -0,0 +1,9 @@
+{
+  "name" : "roles",
+  "configKey" : "roles",
+  "configType" : "roles",
+  "roles" : [ {
+    "id" : "user",
+    "name" : "User"
+  } ]
+}

smardigo/template/user-management/user-management.json

@@ -1,6 +0,0 @@
-{
-  "groups" : [ {
-    "id" : "user",
-    "name" : "User"
-  } ]
-}