Merge branch 'test-protocols' into tap-testsuite-work
* test-protocols:
test harness: work around a VPATH rewrite issue
parallel-tests: work around Solaris XPG4 make segfault
testsuite: fix weird spurious failure with Solaris /bin/sh
testsuite: fix another spurious failure on Solaris make
testsuite: fix two spurious failures on Solaris make
tap driver: refactor and remove dead code
testsuite: fix spurious failure in a test on TAP support
tap: plan location is more liberal w.r.t. non-TAP lines
testsuite: remove now-passing test from XFAIL_TESTS
