ninja-remove unneeded continue statement
Merge branch 'cassandra-2.1' into trunk