DSP-1600 merge C* with DSE 3.0 custom code

This pull is to show the code changes made to cassandra-1.2.2 for merging dse-3.0 custom code. Don't merge the pull to cassandra-1.2.2