Revert CASSANDRA-6132 (pushing to 2.0 only)
Merge branch 'cassandra-1.2' into cassandra-2.0
add consistencyLevel to callback in mutateCounter
Merge branch 'cassandra-2.0' into trunk