Merge changes from topic "revert-20517233-Cloned User Storage Issue-tm-qpr-dev-XJICGTXJHD" into tm-qpr-dev

* changes:
  Revert "Fixing Storage Volume listing for Cloned User."
  Revert "Fixing Storage Volume(s) Retrieval."