preserve jvm_opts w/jemalloc
Merge branch 'cassandra-2.0' into trunk
Support thrift tables in Pig CqlStorage
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5847
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Merge branch 'cassandra-2.0' into trunk
fix missing imports