Ensure that batchlog and hint timeouts do not produce hints

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7058
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/net/MessagingService.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt