Contributed by KWON BYUNGCHANG (cherry picked from commit d78854b928bb877f26b11b5b212a100a79941f35) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java (cherry picked from commit ba6b3a384863b57bc7eeeb736950f544e6ed8d6d)