Bug 941484 - [System2] Fix bootstrap test ordering
Merge pull request #16384 from KevinGrandon/bug_941484_follow_up

Bug 941484 - [System2] Fix bootstrap test ordering