Merge "Add waiters to Nova tests to prevent tearDown failures"