Storage management fix for s3.
Storage management fix for s3.

usnistgov/corr,faical-yannick-congo/corr,faical-yannick-congo/corr,usnistgov/corr,usnistgov/corr,faical-yannick-congo/corr,faical-yannick-congo/corr