updated NOS/MEO apn names

As requested in https://jira.cyanogenmod.org/browse/CYAN-5480

Also: restored Vodafone apn fix made in 74033 and accidentally reverted
in 73922

Change-Id: I426f5dbbe6fd671c26367ce5265d58e0e7dd9f1a