Compensate for time spent waiting for events
Fix issue #7157
Restore event subscription
Increase master timeout during tests now that it is not incorrectly incrementing
Merge pull request #9307 from olliewalsh/client_timeouts

Fix client timeout issues