svn merge -c 1569789 merging from trunk to branch-2 to fix:HDFS-5961. OIV cannot load fsimages containing a symbolic link.