Description of problem:

The `bootstrap-unit` test is consistently failing on PRs in the MCO. Since it is an optional test its failure is not impacting our ability to merge new work or bug fixes, but having it consistently fail is not ideal. The idea of this ticket is to get the test back in a working order so it consistently passes on our PRs. 

Version-Release number of selected component (if applicable):

A quick look at current PRs leads me to think this test is failing in >=4.20 branches, but whoever picks this up should confirm.

How reproducible:

The test is always falling on PRs.

Steps to Reproduce:

See any PR into the MCO and the test will most likely have failed, but an example can be seen here.

Actual results:

The `bootstrap-unit` test consistently fails.

Expected results:

The `bootstrap-unit` should consistently pass so it's failure reports a true issue to investigate.

Additional info:

N/A