Update to use os-custom job
Merge branch 'master' of https://github.com/citrix-openstack/qa