Bug 874471 - Handle mach command help more robustly; r=ted

DONTBUILD (NPOTB) on a CLOSED TREE