2.6: Merged revisions 1437374,1437384,1437618 and 1439346 (JCRSITE-39)

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