Intent to backport

[Nitin Gupta]

Hi,

I intend to backport https://issues.apache.org/jira/browse/OAK-7473    to 1.8 . 
Please let me know if there are any concerns .

Thanks,
Nitin