Merge branch 'fix-loadtest' into pu

* fix-loadtest:
  t: Fix using diag in load.t
Merge branch 'fix-for-netbsd' into pu

* fix-for-netbsd:
  t: Fix 'type' redirection in load.t
  t: Fix using diag in load.t
Merge branch 'drop-echo' into pu

* drop-echo:
  t: Fix test failure using printf instead of echo
  genvers: Use printf instead of echo -n