HDFS-5615: clean up some line wrapping