merge default -> production

--HG--
branch : production
bug 837006 - use query_exe() for make in b2g_desktop_multilocale.py. r=bhearsum

--HG--
branch : production
merge production -> default because i'm a dink
nobug - whitespace pep8 fix