Intent to backport OAK-6229

[Amit Jain]

Hi,

I would like to backport OAK-6229 to 1.4 and 1.6 branches. This fixes a bug
where the 'datastorecheck' command throws an NPE when using the S3DataStore.

Thanks
Amit