HDFS-5000: Fix build failures caused by bad rebasing wrt HDFS-4985