svn merge -c 1579396 from trunk for HDFS-6123. Do not log stack trace for ReplicaAlreadyExistsException and SocketTimeoutException.