Bug 930018 - Fix test_ftu_with_tour.py on aurora

This also includes a cherry-picked commit from master for the test.