3e1eb16837
Follow-on to HADOOP-16830/HADOOP-17271. Contributed by Steve Loughran. Change-Id: I16db6e788c9fd628d3295671d7c2861c249d5ef1