HADOOP-18315. Fix 3.3 build problems caused by backport of HADOOP-11867.#4511

omalley wants to merge 1 commit intoapache:branch-3.3apache/hadoop:branch-3.3from

omalley:hadoop-18315omalley/hadoop:hadoop-18315Copy head branch name to clipboard