fix assert for counters (CASSANDRA-6175)
Merge branch 'cassandra-2.0' into trunk
Upgrade pig to 0.11.1