Change test to avoid shutting down the event loop before all blocking operations return.
Disable gradle manual tests to see if it unblocks CI.
Merge remote-tracking branch 'upstream/master'