Enhance waits for intermittent fails
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Bug 944343 - Marketplace Stage Out-of-date app and failure trying to update
Merge pull request #401 from AndreiH/click_back_xfail

Bug 944343 - Marketplace Stage Out-of-date app and failure trying to update