Merging new openstack version (network scenario v2)