Replace non-upstream test suite fix with upstream equivalent
    
    And clarify comment that all the fixes are upstream in some form
    
    Signed-off-by: Cole Robinson <crobinso@redhat.com>