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

========

https://hg.mozilla.org/integration/gaia-2_0/rev/96ac4e297bda
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1029766 - Intermittent TEST-UNEXPECTED-FAIL | collection_test.js | Vertical - Collection drag icon (/w entry point) into collection r=crdlc

Conflicts:
	shared/test/integration/tbpl-manifest.json
	shared/test/integration/travis-manifest.json
Bumping manifests a=b2g-bump