OAK-1336 Query: use "union" for complex XPath queries that use "or"

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