Fix incorrect value for --container-format option

Fixes: bug #1195351

Cherry-picked from https://review.openstack.org/34742

Change-Id: Id4896d235006de40fbc3d0dc41dbd5e649d99f8f