service catalog test cleanup, switch to wait_for

Each commit should be a reviewable chunk, with the functional changes being mostly in a2dcbb8.

With the exception of `pages/services.py`, the "Files Changed" tab is probably not usable for this PR due to the declassification in 8835321