Updated openstack/openstack
Project: openstack/nova  06a48e11ff213f81b4f6dd63ca6d845209dfd7d8

extract the timeout setup as a fixture

Includes tests for the nova specific parts of this.

Change-Id: I591f3c270804dfb01eab7c8c5d43b87a7abcdeda