Fix NPE during cql3 select with token()

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