Port Bug 1044458 - Work around l10n jobs cherry-picking parts of the build system. rs=port-by-build-system-peer. Part bustage fix for CLOSED TREE DONTBUILD