Merge "Modify OpenStack plugins to harmonize metrics"