Fix upload function for vmdk files

Fix all grep statements failing under -o errexit.

Change-Id: I0591a2ba7351d598eb5b29d68a83ce6290600938
Merge "Fix upload function for vmdk files"
Merge branch 'master' of github.com:openstack-dev/devstack