HDFS-6943. Improve NN allocateBlock log to include replicas' datanode IPs. Contributed by Ming Ma.
HADOOP-11071. KMSClientProvider should drain the local generated EEK cache on key rollover. (tucu)
HDFS-7005. DFS input streams do not timeout. Contributed by Daryn Sharp.
HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long.  (cmccabe)
HDFS-6893. crypto subcommand is not sorted properly in hdfs\'s hadoop_usage (David Luo via aw)
MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other places) (Akira AJISAKA via aw)
Merge branch 'trunk' into HDFS-6581