SLING-3828 : Hardcoded creation of SegmentNodeStoreService config makes it impossible to remove this configuration. Apply patch from David Bosschaert and fix Oak test case setup

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