multi blocks for safe connection pool usage, cucumber upgrade

Not having a great deal of luck replicating this with stress tests, even with multiple clients and various spurious delays injected in 'master' to try to exacerbate the shonky connection handling. I guess we should merge and see *in situ*.

Fixes #691, hopefully.