From: "Brenda J. Butler" <redacted>
Date: Wed, 28 Feb 2018 15:36:19 -0500

Add a command line arg to suppress tap output.  Handy in case
all the tap output is being supplied by the plugins.

Signed-off-by: Brenda J. Butler <redacted>
---

v2:  Drop the first patch that changes the format
     of the tap output.  The second "notap" patch is
     reworked to apply cleanly without the first patch.

Applied.