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

84941: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      83559: Adding long-form QName into JSON rsp, as requested. Part of ACE-2639.


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

config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.desc.xml

@@ -14,12 +14,14 @@
         "properties" : [
           {
             "name" : "eg:propName1",
+            "longqname" : "{http://www.alfresco.org/model/example/1.0}propName1",
             "displayName" : "eg:propName1",
             "dataType" : "d:text",
             "modelQName" : "eg:examplemodel"
           },
           {
             "name" : "eg:propName2",
+            "longqname" : "{http://www.alfresco.org/model/example/1.0}propName2",
             "title" : "Useful Metadata",
             "displayName" : "eg:propName2 (Useful Metadata)",
             "dataType" : "d:text",

config/alfresco/templates/webscripts/org/alfresco/repository/facet/facetable-properties.get.json.ftl

@@ -5,6 +5,7 @@
             <#list properties as property>
             {
                 "name" : "${property.propertyDefinition.name.prefixString}",
+                "longqname" : "${property.propertyDefinition.name?string}",
                 <#if property.localisedTitle??>
                 "title" : "${property.localisedTitle}",
                 </#if>