[Merge] lp:~phablet-team/network-manager/lp1445134-wifi-scan-fix-vivid into lp:~phablet-team/network-manager/vivid-phone-overlay

[Tony Espy]

See the following MP for test results:

https://code.launchpad.net/~phablet-team/network-manager/lp1444162/+merge/267967
-- 
https://code.launchpad.net/~phablet-team/network-manager/lp1445134-wifi-scan-fix-vivid/+merge/267079
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/network-manager/vivid-phone-overlay.