Merge pull request #9469 from asutherland/email-addressparser-apostrophe

Bug 866996 - [email] update addressparser node-dep to not think apostrophes are trying to quote display names. r=asuth(cherry picked from commit b9583de0462c6b126921d317bc9a36c3ab264605)
Merge pull request #9499 from jlebar/sms-use-cpu-lock

Bug 867649 - Switch the SMS app from using the high-priority wake lock t...(cherry picked from commit e9b649b29602e571ef96892f62fc52fb19364639)
Merge pull request #9503 from alivedise/bugzilla/864257

Bug 864257 - update wifi relative signal strength on statusbar, r=timdream, a=blocking-b2g:tef+(cherry picked from commit bc166560b278ef89fa9cb63591ec1d32b810556e)
Merge pull request #9509 from asutherland/tcpsocket-errors

Bug 855569 - [Buri][Shira-48042][Email] Message shown when bad certificates are used is not the right one. r=squib, a=blocking-b2g=tef+(cherry picked from commit de2a73e76b0bbe05759102d2c370eacb7eece6da)
Merge pull request #9511 from gtorodelvalle/dialer-bug-866378-number-can-be-null

Bug 866378 - [OPEN_]It does not have ringtone when receiving an Unknown number call and can not answer this call (r=jmcanterafonseca)(cherry picked from commit c247f1238c6cc7c845796a707982f79cdbc99418)