Merge change 5640 into donut

* changes:
  Bump release version number and speed up make-release.sh script