Openstack changes for Sprint86 merged into a common branch