Merge proposals dependent on lp://qastaging/~openstack-ci/launchpad-work-items-tracker/openstack-work-items

1. openstack-work-items
2. Dependent merge proposals