Renamed some metrics.
Merge branch 'master' of https://github.com/ClarityServices/hyperic-passenger