Merge -c 1295232 from trunk to branch-0.23 to fix HDFS-3012. Exception while renewing delegation token.