Fix dropping columns in trunk

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6520