remove stray bat file
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Cleanup and optimize collation and slice iterators

patch by Aleksey Yeschenko and Benedict Elliott Smith; reviewed by
Aleksey Yeschenko for CASSANDRA-7107
high-scale-lib upgrade

Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
Optimize netty 4 server