Merge "Allow user to specify EAP-SIM under PEAP" into oc-dev