AE-273 (Please pull after https://issues.apache.org/jira/browse/HADOOP-9487 is merged)