OAK-593: Segment-based MK

Fix test cases

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