Bug 1006509 - [marketplace-tests-gaia] Remove code for setting timeouts and use the command line option instead