OAK-593: Segment-based MK

Minor optimizations/cleanups

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