Cherry pick latest PRs for 1.7

[saad-ali]

What type of PR is this? Cherry pick changes from main to release-1.7 branch:

• https://github.com/container-storage-interface/spec/pull/517
• https://github.com/container-storage-interface/spec/pull/509

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce an API-breaking change?:

none