Bug 862338 - contacts settings Done button not working after activating ...
Merge pull request #9151 from etiennesegonzac/bug-859354-call-waiting-alert

Bug 859354 - Add and alerting tone when a second call is waiting.(cherry picked from commit 0cda546da5a2d455f95cf02a189f5f56ab0a5be5)

Conflicts:
	apps/communications/dialer/js/keypad.js
Merge pull request #9304 from mozsquib/email-account-setup-wrap

Bug 863610 - [email] Accounts in the Account Setup can take two lines(cherry picked from commit e0fec96c6e934d39c2da3fec41af01de72f0ac07)
Merge pull request #8564 from alivedise/bugzilla/820177/voice-volume-has-no-mute-state

Bug 820177 - Voice channel doesn't need mute state, r=timdream, a=blocking-b2g:tef+
Merge pull request #9197 from alivedise/bugzilla/856946_master

Bug 856946 - Release CPU wakelock when active channel is telephony, r=timdream, a=blocking-b2g:tef+