Change back to using -DGIT_SHA1.
Merge branch 'cmake' into ctests
Merge branch 'ctests' into cdash