Enhance waits for intermittent fails

http://qa-selenium.mv.mozilla.com:8080/view/Marketplace/job/marketplace.prod/521/
These are intermittents fails on marketplace.prod