Fix fat client schema pull NPE

patch by Mikhail Panchenko; reviewed by Aleksey Yeschenko for
CASSANDRA-6089
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk
Fix NPE in pig with tables created from thrift
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6072
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Change runtime exceptions to IOE in pig
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6099
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
don't let test pass by default
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
add back ScrubTest
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5730
Merge branch 'cassandra-2.0' into trunk
Don't add extraneous field with CqlStorage
Patch by Sam Tunnicliffe, reviewed by Alex Liu for CASSANDRA-6071
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
Merge branch 'cassandra-2.0' into trunk
Fixes for speculative retry
patch by ayeschenko and jbellis for CASSANDRA-5932
Merge branch 'cassandra-2.0' into trunk
fix subList bug