Merge branch 'test-protocols' into tap-testsuite-work * test-protocols: tests: fix spurious failure with Solaris make test harness: fixlet in workaround for VPATH rewrite issue