v3008.1
Fix sdist _version.txt inclusion by deferring git add until source_tarball
Forward-port issue-69402 fixes to 3008.x
Fix remaining .in references