Merge branch 'test-protocols' into tap-testsuite-work * test-protocols: test harness: recursive make invocations must use $(AM_MAKEFLAGS)