Extended the timeout of a long polling reconnect test.
Fixed broken tests.
Merge branch 'release' into dev