Bug 997951 - [marketplace-tests-gaia] Clean up and bolster some tests which are failing intermittently

This includes setting the default marionette timeouts to 60 seconds as we frequently see timeouts as intermittents.
Also includes some new waits and some general code cleanup.