Intent to backport to 1.6: OAK-6267

[Chetan Mehrotra]

https://issues.apache.org/jira/browse/OAK-6267

This is required to fix a bug for setups where bundling is enabled. It
affects DocumentNodeStore based setups

Chetan Mehrotra