Remove new asserts in CMFD
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6208
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk