Update/Merge DSE-Cassandra to the tip of the 1.2 branch from upstream.