Update thrift-generated Constants.java
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	interface/thrift/gen-java/org/apache/cassandra/thrift/cassandraConstants.java