Add ALLOW FILTERING and CONTAINS to cqlsh post-6910

Patch by Robert Stupp, reviewed by brandonwilliams for CASSANDRA-7588
Merge branch 'cassandra-2.1' into trunk