fix javadoc @link
Merge branch 'cassandra-2.0.0' into cassandra-2.0
fix javadoc to not refer to now-defunct MetricName class (@link)
Merge branch 'cassandra-2.0' into trunk