A forward-port of all the .text.exit fixes which went into
2.4.   Also contains a couple of s/MINOR/minor/ changes.