Fix column name in invalid constant type error msg
Merge branch 'cassandra-2.1' into trunk