Additional fix for metrics re vms
Merged upstream metric change (OMS-184)