Extend update test workaround mechanism to upgrade tests
    
    To cover cases like #1767351 where we need to apply a workaround
    to the pre-upgrade environment.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>