Updated some units used for some of the metrics to reflect the correct unit as exposed by jmx..