manually resolved conflicts for the previous big merging from datastax/master.