Merge "corrections to netvirt jobs naming following rename"