Merge proposals dependent on lp://staging/~cyphermox/network-manager/powersave+primaryconnectiontype

1. powersave+primaryconnectiontype
2. Dependent merge proposals