fixes #4290. Test fix. Thread making puts operations quit prematurely. Added catching exceptions of  operations happening before merge  to prevent it.
Merge remote-tracking branch 'hz/maintenance-3.x' into maintenance-3.x-seeburger