OAK-1622 - Duplicate configuration services (regression of OAK-1476)

Changing the logic to use CompositeConfiguration in case of DS mode.

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