Increased timeout in WaitingConsumer in tests.
Merge branch 'dev' of github.com:/EventStore/EventStore into dev