Together forever

Merged openstack/tempest code and my latest code (runs regression tests)