Merge proposals dependent on lp://qastaging/~jdstrand/network-manager/network-manager-lp1296415

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