svn merge -c 1454019 FIXES: HADOOP-9374. Add tokens from -tokenCacheFile into UGI (daryn)


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