make 2i CFMetaData have parent's CF ID
Don't scrub 2i CF if index type is CUSTOM
Fix user defined compaction
Fix serialization test
Create system_auth tables with fixed CFID
Add LOCAL_SERIAL to ThriftConversion
Patch by brandonwilliams for CASSANDRA-6584
Merge branch 'cassandra-2.0' into trunk
update changes
Merge branch 'cassandra-2.0' into trunk