Improving metric name and unit presentation.

Added more regex to map metrics to prettier names
Added count array for appropriate scaling
Expanded units array to map more metrics to corresponding units
Changes relating to OS-207.

Change-Id: I85414966eb0761da82bfd57509a193a1aa94d635