snaptree is no longer a dependency in 2.1 and forwards
Merge branch 'cassandra-2.1' into trunk