Bug 1023208 - [v2.0][v2.1] Fix test_marketplace_launch failure