Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8 am: 49f031ea am: 2f745097 am: c14e9954" into sc-v2-dev