JCR-3812 Improvements to the GQL tools

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1627529 13f79535-47bb-0310-9956-ffa450edef68