r24821: Update the mkrelease.sh script and mkversion.sh to make releasing correct