OAK-1549: AbstractRebaseDiff incorrectly handles conflict in added nodes
@Ignored test case

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1578293 13f79535-47bb-0310-9956-ffa450edef68
OAK-1549: AbstractRebaseDiff incorrectly handles conflict in added nodes
Only report a conflict if the added node on the branch is different from the added node on the trunk

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1578294 13f79535-47bb-0310-9956-ffa450edef68
OAK-1550: Incorrect handling of addExistingNode conflict in NodeStore
Test case

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1578295 13f79535-47bb-0310-9956-ffa450edef68
OAK-1551 - EmbeddedSolrServerProvider stops the SolrRunner at SolrServer#shutdown, minor deployment fixes

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1578342 13f79535-47bb-0310-9956-ffa450edef68
OAK-622 Improve QueryIndex interface (sort using index if possible) (WIP)

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