make NoOp's constructor private as it's a singleton
Merge branch 'cassandra-2.1' into trunk