Unxfail tests2

Replacement for this pull:
https://github.com/mozilla/gaia-ui-tests/pull/1356


`master` -> yes merge
`v1-train` -> no merge