HH-36521 do not rely on the postprocessor to call finish()
HH-36521 more general timeouts
Merge remote-tracking branch 'origin/HH-36521' into release-candidate
release 2.17.20