Updated the metric names to better meet graphite standards and to avoid hiding some metrics
Fixed unit test to cover metric name changes in riakstat.py