OAK-516: reverting r1567089 (affected modules have been excluded for the time being in rev. r1567100)

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