add path to MmappedSegmentedFile assertions
Merge branch 'cassandra-1.2' into cassandra-2.0
Handle null correctly in CqlStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6180
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
Fix updating column_metadata from thrift

patch by slebresne; reviewed by jbellis for CASSANDRA-6182
Only pass UseCondCardMark to 64bit JVMs
Patch by brandonwilliams, reviewed by eevans for CASSANDRA-6190
cqlsh: fix LIST USERS output

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6242
Add IRequestSink interface

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6248
Update memtable size while flushing

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6249