v3008.2
Fix sdist _version.txt inclusion by deferring git add until source_tarball
Merge branch '3007.x' into merge/3007.x/3008.x-26-06-23
Merge remote-tracking branch 'origin/3006.x' into merge/3006.x/3007.x/25-06-08