Run misc/scripts/inc_release, bakefile_gen and autoconf.
Merge with the latest master in preparation for merging into master. Rebake to resolve conflicts in generated files.