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

========

https://hg.mozilla.org/integration/gaia-1_2/rev/36f568ca93e4
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #13382 from bobsilverberg/cp934940

Bug 934940 - Python update test flow to accomodate html changes

========

https://hg.mozilla.org/integration/gaia-1_2/rev/21684ecd46a3
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 934940 - Python update test flow to accomodate html changes

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/messages/manifest.ini