give some antlr targets more heap space
Make batchlog replica selection rack-aware
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6551
merge from 2.1
Merge branch 'cassandra-2.1' into trunk