Goal: 

< Goal based statement, with context - remove these notes before saving -->

• For example: As a <User/Actor>, I Want <to Achieve Some Goal>, so that <Some Reason/Context>.

Acceptance Criteria:

backport and merged below patches to rhoso18

https://review.opendev.org/c/openstack/cinder/+/973447
https://review.opendev.org/c/openstack/cinder/+/973448