cvs2git: escape <<EOF messages, and work around cvsps branch handling
cvs2git: escape <<EOF messages, and work around cvsps branch handling

This escapes '$' characters in <<-handling, and gives preference to
the new branch when cvsps incorrectly reports a commit as originating
on an old branch.

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git