Update java driver to 2.0.4 (for hadoop)

patch by alexliu68; reviewed by slebresne for CASSANDRA-7618
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	build.xml
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix binding null values inside UDT

patch by omichallat; reviewed by slebresne for CASSANDRA-7685
Merge branch 'cassandra-2.1.0' into cassandra-2.1