Adjust result reporting for removal of server roles
    
    Test matrix and cases have been rejigged a bit, update this to
    match.
    
    Signed-off-by: Adam Williamson <awilliam@redhat.com>