Change testvars.json to use a carrier:{} object to contain all information pertaining to the carrier SIM
Merge remote-tracking branch 'upstream/master' into tests_to_carrier_testvars_obj

Conflicts:
	gaiatest/tests/test_sms.py
Merge pull request #792 from zacc/tests_to_carrier_testvars_obj

Change testvars.json to use a carrier:{} object to contain all informati...