OAK-593: Segment-based MK

Revert revision 1549605 that was causing an IT failure

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