(#2435) - disable saucelabs for now

*in the distance, the sound of a bugler mournfully
playing Taps can be heard*
(#2477) - use a Map and Set instead of an object when we have user supplied values