fixes for cinder and manila are proposed as https://review.opendev.org/q/Ifb660688c590fb1c32cbe0ae03e0ea444f19cbb8
fixes for cinder and manila are proposed as https:/ /review. opendev. org/q/Ifb660688 c590fb1c32cbe0a e03e0ea444f19cb b8