Making Openstack Havana related changes.