Remove ICPRR too
Merge branch 'cassandra-2.1' into trunk