Replace branch type in job to allow separate trunk/ctx published branches
Merge branch 'master' of https://github.com/citrix-openstack/qa