Merge "Enable sonar for netvirt and southbound"