Bug 980699 followup to fix typo
Bug 956631: Workaround tarako output directories r=jhopkins
Merge default->production

--HG--
branch : production