OAK-830 XPathToSQL2Converter fails to wrap or clauses
 - better fix

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