don't call getCompactions thru the proxy twice for compactionstats
Merge branch 'cassandra-2.1' into trunk