Merge pull request #17714 from mikedougherty/cs-release-fixes

Fixes for release scripts