Merge -r616876:616877 from trunk to 0.16 branch. Fixes HADOOP-2734.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.16@616891 13f79535-47bb-0310-9956-ffa450edef68