OAK-1462 - Aggregate Index isn't usable in an osgi environment

Merging only the changes done in 1601853 to 1.0. 



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