Fix Thrift slice deletions, incomplete cell names in updates

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7990
Merge branch 'cassandra-2.1' into trunk