Merge proposals dependent on lp://qastaging/~network-manager/network-manager/network-manager.lucid

1. network-manager.lucid
2. Dependent merge proposals