HADOOP-8887 port to branch-2

[Andrew Purtell]

The port of HADOOP-8887 to branch-2 fails the build. Please kindly see
attached.

-- 
Best regards,

   - Andy

Problems worthy of attack prove their worth by hitting back. - Piet Hein
(via Tom White)