HDFS-5000: Initial work, rebased off provisional HDFS-4985