Merge "Bug 598 Added support for vrops metric collection"