HDFS-7444. Addendum patch to resolve conflicts between HDFS-7444 and HDFS-7310.