[Merge] lp:~phablet-team/network-manager/lp1435776 into lp:~phablet-team/network-manager/vivid-phone-overlay

[Tony Espy]

Tested krillin, rc-proposed #171, SIM1: AT&T SIM2: empty

 - phone boots, mobile data (edge-only) connected

 - tested flight-mode ( 5 cycles via the indicator )

 - tested a context/APN w/username, but no passwrd ( this fails w/network-manager 4ubuntu15.1 )
   - manually edited /var/lib/ofono/<IMSI>/gprs after stopping NM & ofono
   - Note: NM won't even attempt to activate this without this fix

Everything worked as expected.
-- 
https://code.launchpad.net/~phablet-team/network-manager/lp1435776/+merge/258633
Your team Ubuntu Phablet Team is subscribed to branch lp:~phablet-team/network-manager/vivid-phone-overlay.