Only do -runUntilPaused if test is setup
Otherwise trying to turn tests off (e.g. SFTP) will get stuck waiting for a non-running test to end
Merge commit 'f32475e06611ffe2a878fa54d9cd4296e9639f83' into fix-tests
Generate standard error on 405 again, but only for write ops
Merge branch 'v2.x-beta' into fix-tests