marketplace/manifest.ini: Add defaults to enable marketplace tests to be run alone
Restore v1-train lockscreen xfails
Unxfail test_cost_control_reset_wifi.py
Merge pull request #1152 from teodosia/unxfail-cc-reset-wifi

Unxfail cc reset wifi
Remove setup/teardown from test_ftu_skip_tour.py as it causes problems on the Leo device