Ninja: add missing @Override to new toString() methods
Merge branch 'cassandra-2.1' into trunk