Merge branch 'test-protocols' into testsuite-work

* test-protocols:
  tests: fix spurious failure for awk implementation of TAP driver
  tap/awk: allow escaping of TAP directives
  coverage: more about escaping of TAP directives
  tap: improve syncing between awk+shell and perl implementations
  tap/perl: don't redirect perl warnings/errors to log files
  tap/perl: add copyright notice, version string, and emacs stuff
  tap/awk: don't redirect awk stderr to log files
  tap/awk: remove obsolete "FIXME" comment

diff --cc ChangeLog
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge