Preparing for bug-fix 2.0.4-alpha release.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453886 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4560. Webhdfs cannot use tokens obtained by another user (daryn)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1453955 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-226-trunk-gd