Updated openstack/openstack
Project: openstack/tempest  f7677674d2f818dae7ee99a347328f88ad4df625

Reorder setup and cleanup functions for readability

As suggested on another patch, reordering these to have the setup
functions together for readability.

Partially-implements bp:resource-cleanup

Change-Id: I8e75d29edc62d30c2ba51f01a3bec490c88adde4