Ensure that AP list has one INTERNET and one MMS access point

Also, minimized differences with upstream version of provision.c