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

Also, minimized differences with upstream version of provision.c
Merge pull request #164 from jkangas/next

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