cqlsh: fix message when zero rows are returned

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7580
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	bin/cqlsh
Merge branch 'cassandra-2.1' into trunk