- thirdparty neutron CI changes with devstack using
  contrail packages
- fix contrail-api.conf
Merge branch 'master' of github.com:Juniper/contrail-infra-config