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

========

https://hg.mozilla.org/integration/gaia-1_2/rev/d273b1eabee3
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #12835 from wanderview/shared-tvm-append

Bug 918179: Optimize append case in tag_visibility_monitor.  r=djf
(cherry picked from commit ea967f79e5f29e752b9abb4df14fc334946560a0)
Bug 922694 - Part 1: split Distribution class to allow for use from FHR, use buffer when expanding zip contents. r=margaret, a=lsblakk
Bug 922694 - Part 2: expose distribution ID. r=margaret, a=lsblakk
Bug 922694 - Part 3: FHR changes for distribution and locale. r=mcomella, a=lsblakk
Bug 922694 - Part 4: grab Accept-Locale pref in FHR. r=mcomella, a=lsblakk
Bug 922694 - Part 5: grab distribution ID in FHR. r=mcomella, a=lsblakk
Bug 922694 - Part 6: follow-up to fix test. r=nalexander, a=lsblakk
Bug 922694 - Part 7: use standalone prefs to avoid racing with startup. r=ckitching, a=lsblakk
Bug 918120. Reduce-ocsp-timeout soft fail to 3 secs. r=bsmith a=lsblakk
Bug 928655 - Set dom::Exception::mThrownJSVal to null in Unlink. r=khuey a=lsblakk
Bug 925902 - Ensure that the old ROOT_SCROLL_ID property is cleared when a new one is being set. r=tn,botond a=koi
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/aa493e4f29ac
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #12292 from basiclines/settings-highlights"

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

========

https://hg.mozilla.org/integration/gaia-1_2/rev/05fa14983f80
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #13077 from nullaus/v1.2

Merge pull request #12927 from nullaus/bug918143-group-notifications

========

https://hg.mozilla.org/integration/gaia-1_2/rev/4f05a765af97
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #12927 from nullaus/bug918143-group-notifications

bug 918143(cherry picked from commit 163f47b8ca0c6f9cead75347793d8fc39bfefa59)

Conflicts:
	apps/system/test/marionette/lib/notification.js
	apps/system/test/marionette/notification_test.js