svn merge -c 1404985 FIXES: HDFS-3804. TestHftpFileSystem fails intermittently with JDK7 (Trevor Robinson via daryn)