Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into trunk
Check that key_aliases/column_aliases exists before using them
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6589
Merge branch 'cassandra-2.0' into trunk
fix indentation
Merge branch 'cassandra-2.0' into trunk
Pre-6504 cleanup and fixups

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6504
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
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
skip blocking on streaming during drain
patch by jasobrown; reviewed by yukim for CASSANDRA-6603
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
By default cassandra will no longer start without jna
patch by clardeur reviewed by dbrosius for cassandra 6575