OAK-2335 - IndexPlanner does not return plan for mixin based queries

Merging revisions 1644383

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/branches/1.0@1644558 13f79535-47bb-0310-9956-ffa450edef68
OAK-2282 - Make current testcases pass with new index implementation

Merging revisions 1644547,1644552,1644554

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