Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

120439 jvonka: RA-630: FileFolder API - update antlr grammar in REST fwk for select/where clause
   - to allow colon in property name identifier (json path)
   - also update impl + test


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

source/java/org/alfresco/rest/api/impl/NodesImpl.java

@@ -1539,8 +1539,6 @@ public class NodesImpl implements Nodes
                 str = str.substring(PREFIX.length());
             }
 
-            str = str.replaceFirst("_", ":"); // FIXME remove this when we have fixed the framework.
-
             QName name = createQName(str);
             if (!EXCLUDED_PROPS.contains(name))
             {