svn merge -c 1497143 from branch-2 for HDFS-4932. Avoid a wide line on the name node webUI if we have more Journal nodes.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1.0-beta@1499623 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1498057 from branch-2 for HDFS-4944. WebHDFS cannot create a file path containing characters that must be URI-encoded, such as space.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1.0-beta@1499624 13f79535-47bb-0310-9956-ffa450edef68