Update the setUp in the test_marketplace_without_connectivity.py
Merge remote-tracking branch 'upstream/master' into test_mk_conn_setUp
Merge remote-tracking branch 'upstream/master' into test_mk_conn_setUp
Remove redundant enable_wifi from test_marketplace_without_connnectivity setUp
Merge pull request #766 from zacc/test_mk_conn_setUp

Update the setUp in the test_marketplace_without_connectivity.py