Bug 1060218 - [System] Minor marionette test cleanup r=kgrandon
Merge pull request #23455 from KevinGrandon/bug_1060218_system_cleanup_marionette_tests

Bug 1060218 - [System] Minor marionette test cleanup