Change-Id: I6028247466378327f03b71dc2063dd2777b9382a
See vishy's nova branch: https://review.openstack.org/#change,2892 Change-Id: I6a5bec55edd21f659674f478282e65fd6b1b0b1e