Fix the waits.

Changes in pull request #899 to the wait methods broke some of the config loading/reloading system tests. This fixes them.