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

========

https://hg.mozilla.org/integration/gaia-central/rev/aff515e4b4a6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #14998 from KevinGrandon/bug_956012_update_mobile_shims

Bug 956012 - Desktop b2g with local profile is trying to load the SIM / JavaScript error: conn.setVoicePrivacyMode is not a function

========

https://hg.mozilla.org/integration/gaia-central/rev/9bb3ec8d604c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 956012 - Desktop b2g with local profile is trying to load the SIM / JavaScript error: conn.setVoicePrivacyMode is not a function
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/b5383b5a8ac3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #14997 from KevinGrandon/revive_gaia_ui

Revive gaia-ui-tests

========

https://hg.mozilla.org/integration/gaia-central/rev/6ea94ac09e2b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revive gaia-ui-tests
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2977ae6150d7
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #15000 from cctuan/956208

Bug 956208 - [Gaia][Build] add gaiaDir variable in getPid function

========

https://hg.mozilla.org/integration/gaia-central/rev/59faa7c52b52
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 956208 - [Gaia][Build] add gaiaDir variable in getPid function
Merge m-c to b2g-inbound
merge b2g-inbound to mozilla-central
Bug 952742 - [Australis] "Move to menu" label is using the wrong entity for accesskey; r=dolske
Bug 742500 - Disable expired telemetry probes. r=vladan
Bug 949858 - Make sure we're not duplicating toolboxes and that we forget about them at the app-manager level. r=ochameau
Bug 952040 - webapprt: overrides: Use 'received' instead of 'recieved' and remove pairs of whitespaces. r=tabraldes
Bug 953184 - Do not show an error if user cancels the file chooser dialog when importing a CSS file in Devtools Style Editor. r=harth
Backed out changeset 70fd824abff0 (bug 742500) for xpcshell orange.
Bug 742500 - Disable expired telemetry probes. r=vladan
Merge fx-team to m-c.
Backed out changeset 79e3fe8c4ba9 (bug 952742)
Merge mozilla-central into holly.