OAK-1108 Query constraints marked as invalid in the case of an mvp
 - fixed compilation issue on test

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