Fix potential AssertionError during tracing

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6041
Fix NPE in sstablesplit

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6027
Merge branch 'cassandra-2.0' into trunk