[Merge] lp:~phablet-team/ofono/ofono-bug-updates into lp:~phablet-team/ofono/ubuntu

[Martti Piirainen]

Sanity checked in mako on top of image 157: All four changes are included, basic voice and messaging functionality is unaffected.
-- 
https://code.launchpad.net/~phablet-team/ofono/ofono-bug-updates/+merge/228764
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/ofono/ofono-bug-updates into lp:~phablet-team/ofono/ubuntu.