Merge proposals dependent on lp://qastaging/~cyphermox/network-manager/lp438834-mppe-methods-combo

1. lp438834-mppe-methods-combo
2. Dependent merge proposals