[Merge] lp:~phablet-team/network-manager/lp1445080 into lp:~phablet-team/network-manager/vivid-phone-overlay

[Mathieu Trudel-Lapierre]

Review: Approve

Looks fine to me; please fix the issues Alfonso mentioned, but I didn't find anything else that jumped out.
-- 
https://code.launchpad.net/~phablet-team/network-manager/lp1445080/+merge/262782
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/network-manager/vivid-phone-overlay.