Description of problem:
HPE 3par Storage requesting a backport of below patches [1] and [2] into RHOSP 17.1.

[1] Fix retype volume
https://review.opendev.org/c/openstack/cinder/+/928599
[2] Update the calculation of free_capacity
https://review.opendev.org/c/openstack/cinder/+/935615

Version-Release number of selected component (if applicable):
17.1

These patches [1] and [2] are merged into OpenStack's master branch.

Additional info:
Request to please include these fixes in upcoming RHOSP 17.1.5.
Thanks.

This will help customers to get bug fixes in their RHOSP environment.