service catalog test cleanup, switch to wait_for

Each commit should be a reviewable chunk, with the functional changes being mostly in a2dcbb8.