Merge branch 'ab/t5314-avoid-losing-exit-status' into maint-2.39