Fix some timeout issues on WaitingObserver and also changes to timeout integration tests to take account of server side timeouts.