Merge proposals dependent on lp://qastaging/~mariusko/network-manager/ubuntu_refresh_patches_for_upstream

1. ubuntu_refresh_patches_for_upstream
2. Dependent merge proposals