Fix insufficient validation of UPDATE queries against counter cfs

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5300
Merge branch 'cassandra-1.2' into trunk