Fix LIMIT with static columns

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6956
Fix 6956 patch