Merge proposals dependent on lp://qastaging/~ajkavanagh/ubuntu-openstack-ci/fix-port-clean-up-tox

1. fix-port-clean-up-tox
2. Dependent merge proposals