Merge -r 959500:959501 from trunk to branch-0.21. Fixes: HADOOP-6800.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@959503 13f79535-47bb-0310-9956-ffa450edef68
5 files changed