Bug 856392 - Categorize mach commands; r=jhammel

DONTBUILD (NPOTB)