changes for CASSANDRA-7413
Merge branch '361' into 361-151-362