Merge m-c to inbound.
Bug 973892 - Make TextureClient::GetAsDrawTarget work with canvas. r=bas
No bug - Fix broken tags. DONTBUILD
Bug 978333 - Try to use localhost for marionette webserver if possible. r=jgriffin
Bug 979299 - Reduce fragility in real time test. r=dburns

Sometimes the clock.sleep(0.1) may take shorter than 0.1 seconds.  This
isn't a test about precision in Python, but rather that the SystemClock
wrapper works as intended and returns a somewhat expected value.
Bug 514280 Stop using nsCOMPtr for concrete types r=bsmedberg

--HG--
extra : rebase_source : eaca8b2925eaffb49e29a617cd72c0d6686e6d9e
Bug 514280 Remove GetIID r=bsmedberg

--HG--
extra : rebase_source : 179d6cd1cfb272ca258b0bc64225b27252c9ffbe
Bug 957723 - Decommit unused portions of the nursery; r=jonco
Bug 982597 - Remove backwards compatibility for the "sources" packet. r=fitzgen
Bug 983970  - Properly sanitize more escape characters in string literals; r=benvie
Bug 970172 - Prevent VariablesView Variables from handling clicks while editing. r=vporof
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/bf0e846f93b0
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #17228 from dominickuo/bug-958470-new

Bug 958470 - [Ringtones] set ringer type and use web audio api to preview the ringtones, r=jimporter

========

https://hg.mozilla.org/integration/gaia-central/rev/c378a9e41a95
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 958470 - [Ringtones] set ringer type and use web audio api to preview the ringtones
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/817206b9f39d
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #17129 from etiennesegonzac/bug-981468-callgroup-keypad

Bug 981468 - Fixing JS erros occuring while using the keypad during a conference call. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/06c4009f019c
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 981468 - Fixing JS erros occuring while using the keypad during a conference call.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/45ebcbddf7fa
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17143 from arcturus/bug-947189

Bug 947189 Long tap on contacts details to choose SIM

========

https://hg.mozilla.org/integration/gaia-central/rev/bf3fa5bdca1c
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 947189 Long tap on contacts details to choose SIM
Bumping manifests a=b2g-bump
Merge mozilla-central to b2g-inbound
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c7c667992e1c
Author: Jan Keromnes <janx@linux.com>
Desc: Merge pull request #17204 from jankeromnes/securityhud

Bug 983710 - Add a "Security issues" category to the Developer HUD. r=21

========

https://hg.mozilla.org/integration/gaia-central/rev/ab0ab153bca4
Author: Jan Keromnes <janx@linux.com>
Desc: Bug 983710 - Add a "Security issues" category to the Developer HUD. r=21
Bumping manifests a=b2g-bump