Patch Set 4: Looks good to me, but someone else must approve; IP review completed

This now compiles.  Thanks Matthias for locating the places tools/version.sh didn't update correctly; these have been addressed in the script and in are included in this version change.