Merge changes I3513ae17,Ia0b51165,I461d8b3d

* changes:
  make testdata: look for other variants of sha1sum
  make testdata: fail if a sha1 fails or is missing
  test-data.sha1: add missing checksums