Merge 1400552 from trunk to change incorrect jira number HADOOP-8923 to HADOOP-8932 introduced in commit r1398883.