Picking up 0.5.35 of marionette_client, see bug 891139.
Fix browser bookmark test
Revert "[v1-train] remove travis yml on v1-train branch"

This reverts commit e2a565bb6bf392aa7af40c611e273242e37a3522.