OAK-1372 XPath queries with both path and property restrictions are slow

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