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

[Tony Espy]

Tested on arale / rc-proposed / #88.

Ran all of the Basic Tests from:

https://wiki.ubuntu.com/Process/Merges/TestPlans/network-manager

No problems found.

-- 
https://code.launchpad.net/~phablet-team/network-manager/lp1444162/+merge/267967
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/network-manager/lp1425172.