Modified unit for volume and snapshot capacity (ZEN-10282)
Merge remote branch 'upstream/develop' into develop
Merge pull request #68 from ssirushchyshyn/develop

ZEN-10282