Never return more columns than requested patch by byronclark; reviewed by slebresne for CASSANDRA-3303 and 3395