Add optimized CF.hasColumns() implementations

patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-6941
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java