svn merge -c 1405237 from trunk for HDFS-4143. Change blocks to private in INodeFile and renames isLink() to isSymlink() in INode.