[Merge] lp:~mathieu-tl/network-manager/prov-fix into lp:~network-manager/network-manager/ubuntu

[Ricardo Salveti]

Review: Approve

Seems it works better, tested with both mako and maguro, but I was still able to reach a weird state at least once: http://paste.ubuntu.com/6115886/

Unfortunately I wasn't able to reproduce this with more debugging enabled.
-- 
https://code.launchpad.net/~mathieu-tl/network-manager/prov-fix/+merge/185839
Your team Network-manager is subscribed to branch lp:~network-manager/network-manager/ubuntu.