Merge V1.4 to HEAD

- Ignored Enterprise-specific changes
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3701 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3703 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3704 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3705 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3707 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3876 .
   svn revert root\projects\web-client\source\web\jsp\admin\admin-console.jsp


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

source/java/org/alfresco/repo/domain/hibernate/Node.hbm.xml

@@ -364,15 +364,19 @@
          transaction.changeTxnId = :changeTxnId
    </query>
 
-   <query name="node.GetContentDataStrings">
-      select distinct
-         props.stringValue
+   <query name="node.GetNodesWithPropertyValuesByActualType">
+      select
+         node
       from
          org.alfresco.repo.domain.hibernate.NodeImpl as node
       join
-         node.properties props
+         node.properties prop
       where
-         props.stringValue like 'contentUrl%'
+         (
+            prop.actualType = :actualTypeString or
+            prop.actualType = 'SERIALIZABLE'
+         ) and
+         prop.persistedType != 'NULL'
    </query>
 
    <query name="node.patch.GetNodesWithPersistedSerializableProperties">