CASSANDRA-3732 and CASSANDRA-3676

f2b5d47 should be applied to all active branches
a3d26cf should only be applied where snaptree is in use