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