svn merge -c 1398293 from trunk for HDFS-4036. Remove "throw UnresolvedLinkException" from FSDirectory.unprotectedAddFile(..).