Makes two tests wait for the instance to go ACTIVE

In environments with limited resources, these two
tests can fail intermittently because of some timing
related to resizing. Waiting for the instance to
return to active resolves the resulting 422s.

Change-Id: Ib82f7dcd43f1f7fbba5c5ade44785243d9d1186d
Merge "Makes two tests wait for the instance to go ACTIVE"