fixing neutron stuff
Merge branch 'master' of github.com:rcbops/jenkins-build