Merge mozilla-central to mozilla-inbound

b2g/config/otoro/config.json

b2g/config/otoro/releng-otoro.tt

b2g/config/unagi/config.json

b2g/config/unagi/releng-unagi.tt

python/mach/mach/main.py

toolkit/components/downloads/test/browser/Makefile.in

...mponents/downloads/test/browser/browser_private_resume.js

.../downloads/test/browser/browser_privatebrowsing_cancel.js

toolkit/components/downloads/test/browser/head.js

...kit/components/downloads/test/unit/test_private_resume.js

...ponents/downloads/test/unit/test_private_resume_global.js

...it/components/downloads/test/unit/test_privatebrowsing.js

...onents/downloads/test/unit/test_privatebrowsing_cancel.js

...downloads/test/unit/test_privatebrowsing_cancel_global.js

...onents/downloads/test/unit/test_privatebrowsing_global.js

toolkit/components/downloads/test/unit/xpcshell.ini