Merge "Bug 4881 - failure in netvirt.AbstractEventTest"