os-trunk-test is generated from os-ctx-test
Merge branch 'master' of github.com:citrix-openstack/qa