Followup to HADOOP-18889 third party store support; Fix some minor review comments which came in after the merge.