Merge branch 'simplify-exit-trap-workaround' into maint * simplify-exit-trap-workaround: tests: simpler workaround for shells losing the exit status in exit trap + Extra non-trivial edits: * t/am-missing-prog.sh: Use 'exit, not 'Exit'. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>