Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

64503: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      64010: Fixed the returned JSON for the get admin-sites webscript, which wasn't returning the correct JSON with empty "entries".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/templates/webscripts/org/alfresco/repository/generic-paged-results.lib.ftl

@@ -76,12 +76,13 @@ Usage:
 			"skipCount" :${data.skipCount?c},
 			"maxItems" : ${data.maxItems?c}
 		},
-	    "entries" : [{
+	    "entries" : [
 	<#list data.items as item>
+	        {
 	            "entry" : {
                     <#nested item>
 	            }    
-		    }<#if item_has_next>, {</#if>
+		    }<#if item_has_next>,</#if>
 	</#list>
         ]
 	}

config/alfresco/templates/webscripts/org/alfresco/repository/site/site-admin-sites.get.json.ftl

@@ -11,14 +11,15 @@
 	                "lastModifiedDate" : "${xmldate(item.siteInfo.lastModifiedDate)}",
 	                "visibility" : "${item.siteInfo.visibility}",
 	                "userIsSiteManager" : "${item.currentUserSiteManager?c}",
-	                "siteManagers" : [{
+	                "siteManagers" : [
 	                     <#list item.members as manager>
+	                    {
 	                        "entry" : {
 	                            "userName" : "${manager.userName}",
 	                            "firstName" : "${manager.firstName}",
 	                            "lastName" : "${manager.lastName}"
 	                        }
-	                    }<#if manager_has_next>, {</#if>
+	                    }<#if manager_has_next>,</#if>
 	                     </#list>
 	                ]    
 </#escape>