Merge pull request #199 from jrperritt/storage-v1-cleanup

Object Storage Miscellaneous