Improve error message from 7499
Update java driver to 2.0.5 (for hadoop)
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	build.xml
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Merge branch 'cassandra-2.1' into trunk