BTree updates may call provided update function twice

patch by Benjamin; reviewed by Benedict for CASSANDRA-8018
Merge branch 'cassandra-2.1' into trunk