Merge the squash branch into the redo branch

addInheritedCheckpointTrailer now takes the commit's source, so the redo path passes it through: a -m redo keeps its # lines as message content (TestPrepareCommitMsg_RedoWithHashSubjectKeepsItsSubject).