increase marketplace launch timeout for all environmentts
Chnage the "is_wifi_enabled" property in GaiaData to inspect the mozWifiManager rather than the setting
Both FTU tests: Wait for WiFi to be enabled after loading FTU so that FTU Wifi panel will work first time
Merge pull request #1134 from vaidik/fix_timeout_for_marketplace

increase marketplace launch timeout for all environmentts
Added carrier tag to default manifest file for cost control

Conflicts:

	gaiatest/tests/cost_control/manifest.ini
Merge remote-tracking branch 'upstream/master'
Revert "Bug 896541 - Device crashes into infinite loop when running Marketplace/ Persona"

This reverts commit 907697bbf4b836fa246233c04ea3a48baec9e6fb.
Remove xfail email
Merge pull request #1142 from bebef1987/revert

Revert "Bug 896541 - Device crashes into infinite loop when running Marketplace/ Persona"
Merge pull request #1140 from zacc/test_ftu_skip_wifi_wait

Add revised wait for the WiFi in FTU tests
Xfailed test_call_log_all_calls due to bug 897036
Bug 897036 - Dialer app remains at 10% loading when test_call_log_all_calls is run
https://bugzilla.mozilla.org/show_bug.cgi?id=897036

whatever
Merge pull request #1143 from bebef1987/xfail_call

Xfailed test_call_log_all_calls due to bug 897036