Fix missing columns in wide rows queries

patch by slebresne; reviewed by driftx for CASSANDRA-5225
Merge branch 'cassandra-1.2' into trunk