Bug 894746 - Properly truncate mach build terminal footer; r=ted

DONTBUILD (NPOTB)
Bug 895670 requires a clobber
Merge inbound to m-c.
Merge inbound to m-c.