[Merge] lp:~phablet-team/ofono/vivid-ww17-update into lp:~phablet-team/ofono/ubuntu

[Tony Espy]

Changed the status to merged, as the code is now present in trunk.

This branch wasn't merged directly, but in pieces due to a problem caused by the PUK retry fix.
-- 
https://code.launchpad.net/~phablet-team/ofono/vivid-ww17-update/+merge/257204
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/ofono/ubuntu.