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

[Tony Espy]

This is my own patch. I discussed this with dcbw on Friday, and he vetted the approach. He'd made similar changes in an un-landed branch in the upstream git tree, but as his changes are much more extensive, I opted for a simpler approach to fix this bug.

DEP-3 tags added to the patch.

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