HDDS-2222 (#1578)

Thanks @jnp  for reviewing this.  Merging now.
4 files changed