HSHA rethrows OOM
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6255
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Paginate batchlog replay

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6569
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286