Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029

* changes:
  Use updated enterprise API
  Fix EAP field display for a new network
  Allow only valid EAP configs
  Update enterprise API usage