OAK-1551 - added missing labels

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1578418 13f79535-47bb-0310-9956-ffa450edef68
OAK-1552 - switch to newest solr.xml format

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1578419 13f79535-47bb-0310-9956-ffa450edef68
OAK-1533 - add dbcp BasicDataSource (WIP)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1578423 13f79535-47bb-0310-9956-ffa450edef68
OAK-622 Improve QueryIndex interface (bugfix)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1578431 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'upstream-trunk' into OAK-1263