Merge "Reenable jvm plots for netvirt"