Forward port of release and build changes from 2.1
Merge pull request #1438 from drewhk/wip-release-script-updates-drewhk

Forward port of release and build changes from 2.1