CQL3 refactor to allow conversion function

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5226
Fix drop of sstables in certain circumstance

patch by slebresne; reviewed by jbellis for CASSANDRA-5232