Forward port of release and build changes from 2.1

I tried release --dry-run to double check that it works properly