Repair bad merge in test_everythingme_install_app.py
xfail Bug 899098 - Database Upgrade message is present in Gallery even if the SD card is empty
marketplace/manifest.ini: Add defaults to enable marketplace tests to be run alone
Un xfail tests
Bug 899984 - Everything.Me search results take a long time to show
xfail Bug 900012 - crash in mozilla::layers::GrallocBufferActor::ActorDestroy(mozilla::ipc::IProtocolManager<mozilla::ipc::RPCChannel::RPCListener>::ActorDestroyReason)
Xfail test_camera_multiple_shots bug #900012
Remove setup/teardown from test_ftu_skip_tour.py as it causes problems on the Leo device
Xfail 2 lockscreen_to_camera tests
Unxfail test_add_contact_to_favourites.py
Unxfail test_gallery_edit_photo.py
Unxfail SIM import tests
Bump marionette client to 0.5.36, see bug 899731
disable Keyboard FTU
xfail Bug 900905 - Changing mozSettings value of "keyboard.ftu.enabled" has no effect when launching the Keyboard app for the first time
Put preventative wait into Contacts tests to wait for contacts lists to load especially after API insertions
xfail Bug 877611 - Make "Select time" popup, in Calendar app, more test friendly
Put preventative wait for app_update_notification for test_system_notification.py
Bug 899984 - Everything.Me search results take a long time to show
TBPL disable test_system_notification with Bug 900991