Addresses additional wording for image storage.

fix bug 1179235

Cherry pick from https://review.openstack.org/#/c/28942/

Change-Id: I627588c0573173f5bc5c379fa44a9fd53fa389b6
Merge "Addresses additional wording for image storage." into stable/folsom