Bug 1067597 - python errors in mobile_l10n.py r=jlund
Bug 1019962 - Fix super _pre_config_lock calls. r=jlund
Landed by mistake. r=backout
Bug 1019962 - Fix super _pre_config_lock calls. r=jlund
Bug 1066187 - Upload gecko.log for non-emulator Mn/Mnw tests, r=armenzg
merge default -> prod

--HG--
branch : production