Fix build
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
ninja add benedict to committers
Merge branch 'cassandra-2.1' into trunk