Brandon Li c1e2673754 HDFS-6056. Merging change r1598782 from trunk 11 rokov pred
..
core-site.xml c1e2673754 HDFS-6056. Merging change r1598782 from trunk 11 rokov pred