ACCUMULO-2623 Using a shorter prefix for Metric's ToStringBuilder

This eliminates the pointless package info, as well as the hash code
Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'