OAK-1941 - refactoring

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1632572 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'apache-jackrabbit-oak/trunk' into trunk