Fix int/bigint in CassandraStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6102
Merge branch 'cassandra-1.2' into cassandra-2.0