TBD-1018: fix the data type problem of cassandra 1.1.2.
Merge remote-tracking branch 'origin/maintenance/5.6'