Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_4/rev/2a0d167fb2d0
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #21073 from jrburke/bug1025727-v1.4-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s) r=mcav a=bajaj

========

https://hg.mozilla.org/integration/gaia-1_4/rev/84019cae3a65
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s)

From master commit e64d7adf507d0f0164988257d30600499b1e5776

Conflicts:
	apps/email/js/cards/compose.js
Bumping manifests a=b2g-bump