Patch the version number used in the build

Upstream didn't use the correct version number in the builds for this
release.  I'm not sure it makes a practical difference, but fix the
version number up anyway.

Automate release

Make the release prep stage common too

Merge branch 'automate-releases' into next