Merge pull request #15916 from mikedougherty/release-flexibility

Improve flexibility of release scripts