Bug 985546 - Use git_revision in gaia.json's git dict, r=aki
Merge default->production

--HG--
branch : production