Build: Improve SauceLabs testing
Merge pull request #6388 from LaurentGoderre/improve-saucelabs

Build: Improve SauceLabs testing