Move hints and exception count to o.a.c.metrics

patch by yukim; reviewed by jbellis for CASSANDRA-6017
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageProxy.java
Merge branch 'cassandra-2.0' into trunk
Fix NPE in nodetool on booting instances.
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-5968
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
make sstablesplit respect default size
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
r/m code to load deprecated, pre-1.2 cache format
patch by jbellis; reviewed by Vijay for CASSANDRA-6031
Merge branch 'cassandra-2.0' into trunk
Fix CommitLogReplayer date time issue
patch by Vijay ; reviewed by jbellis for CASSANDRA-5909
Merge branch 'cassandra-1.2' into cassandra-2.0
Additional NEWS and test fixes for 2.0 (part of CASSANDRA-5909)
Merge branch 'cassandra-2.0' into trunk
CAS may return false but still commit the insert

patch by slebresne; reviewed by jbellis for CASSANDRA-6013
CAS should distinguish promised and accepted ballots

patch by slebresne; reviewed by jbellis for CASSANDRA-6023
Merge branch 'cassandra-2.0' into trunk
don't declare throwing exceptions that aren't thrown
Merge branch 'cassandra-2.0' into trunk