OAK-1933 Query: UnsupportedOperationException for some combinations of "or" and "and" conditions

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