Merge proposals dependent on lp://qastaging/~oem-solutions-group/network-manager/ubuntu.hardy.07

1. ubuntu.hardy.07
2. Dependent merge proposals