Bug 945577 - Followup to mach rbt so argument parsing works as expected

DONTBUILD (NPOTB)

--HG--
extra : rebase_source : 7923ee6b52aaba9eb3ab205a68517608e43894c8