support for havana release of openstack
removing conflicts