Bug 1064909 - ensure the menubar webrtc indicator doesn't use strings that don't exist on Firefox 34, r=Gijs, a=lmandel.
Bug 1067444 - Clicking the microphone button on the global webrtc sharing indicator opens a doorhanger with a camera icon, r=gavin, a=lmandel.
Bug 1056179 - WebRTC global indicator fails to open the sharing doorhanger if there's another notification before it, r=gavin, a=lmandel.
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/6a155d3a8e06
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #24605 from jmcanterafonseca/position_ice_contacts_21

Bug 1069974 - [Contacts] [ICE] Deleting ICE Contact 1 makes ICE Contact ...

========

https://hg.mozilla.org/integration/gaia-2_1/rev/ff43b4380d72
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1069974 - [Contacts] [ICE] Deleting ICE Contact 1 makes ICE Contact 2 to promote to position 1(cherry picked from commit 84c9fcb8c846203ede478c05886ef9fff9384f79)
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/735e16015326
Author: crdlc <crdlc@tid.es>
Desc: Bug 1071632 - [Contacts] [ICE] ICE Group is not properly refreshed after removing all phone numbers of an ICE Contact

Conflicts:
	apps/communications/contacts/test/marionette/ice_test.js
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/e15fdc9e0bb8
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #24611 from jmcanterafonseca/delete_phones_ice_v21

Bug 1061420 - [Contacts] Delete all numbers which belong to an ICE conta...

========

https://hg.mozilla.org/integration/gaia-2_1/rev/bf33f9a5f73c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 1061420 - [Contacts] Delete all numbers which belong to an ICE contact, that ICE should be removed from ICE list
Bumping manifests a=b2g-bump
Bug 1074561 - Allow media plugins to run on Linuxes without sandboxing support. r=jesup a=sledru

--HG--
extra : amend_source : d265bb5152825867a12b25b94b337ac99f6e5bf7
Bug 995438 - Call SpecialPowers.pushPermissions() to ensure permission change is completed before continuing the rest of the tests. r=baku, a=test-only
Bug 982600 - Disable tests that only make sense with crashreporter. r=markh, a=test-only
Bug 1064320 - NSC_Encrypt returns uninitialised garbage which is handed onwards to realloc. r=dkeeler, a=sledru
Bug 1071438 - Make client.mk detect python like configure and mach do. r=mshal, a=sledru
Bug 1073502 - Restore closed windows even when there are no open windows on startup. r=yoric, a=sledru
Bug 1074548 - Lazy-allocate webrtc trace buffers in RELEASE_BUILDs. r=ted, a=sledru
Bug 1073863 - Use origin in activation panel rather than name. r=markh, a=sledru
Bug 1070703: Enable MP4 decoding in Mac OS 10.6 and 10.7. r=rillian, a=lmandel

This commit is made of backports extracted from bugs 1068455, 1068597 and 1067697
Bug 1062596: Bump thread stack size on OS X to avoid crashes. r=kinetik, a=lmandel
Bug 1072645 - Use stateless event filtering in GeckoTouchDispatcher, r=kats, a=lmandel