Bug 1007485 - manifest.webapp shoud not be localized in en-US if LOCALE_BASEDIR/en-US exists
Merge pull request #21172 from yurenju/multilocale-manifest

Bug 1007485 - manifest.webapp shoud not be localized in en-US if LOCALE_... r=@cctuan
Bug 1036821 - git commit hash isn't wrote to settings/resources/gaia_commit.txt on Windows