Some more fixes for Openstack CI
Merge branch 'master' of github.com:Juniper/contrail-infra-config