Updated openstack/openstack
Project: openstack/heat  d22d3d9f693a1a2e0fbc67dd3561ea620fff3c6f
null
Nova keypair validation breaks client plugins

Changes made to the nova keypair validation functionality break the
client plugin functionality.

Change-Id: Ia45db6dc369fe75520de03347e16b8e3f3c6ced8
Closes-Bug: #1280016
Updated openstack/openstack
Project: openstack-dev/devstack  9db04f7f30012e5d685d10d350c765ee0ce3f00e
null
Fix upload function for vmdk files

Fix all grep statements failing under -o errexit.

Change-Id: I0591a2ba7351d598eb5b29d68a83ce6290600938