OAK-2146: empty resultset for PropertyIndex and multi-value properties with mixed OR+AND
Merge revision r1630299 from trunk

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