ensure that srcdist inserts the correct version into the bundled makefile
Add version.mk, avoid sed when building srcdist, allow VERSION to be provided
Merged bug25584 into stable