(ninja) Deduplicate BatchStatement hasConditions inference logic
Merge branch 'cassandra-2.1' into trunk