HDDS-48. Fix branch after merging from trunk.
2 files changed