Fix exception when adding collection to table

patch by slebresne; reviewed by dbrosius for CASSANDRA-5117
Merge branch 'cassandra-1.2' into trunk