bug 853600 - fix b2g desktop compare-locales on windows. r=bhearsum
merge default -> production

--HG--
branch : production