Syncing latest changes from upstream devel for ceph-csi

[df-build-team]

PR containing the latest commits from upstream devel branch

[nixpanic]

/approve
/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: df-build-team, nixpanic

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [nixpanic]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[nixpanic]

/cherry-pick release-4.16

[openshift-cherrypick-robot]

@nixpanic: #269 failed to apply on top of branch "release-4.16":

Applying: rebase: bump github.com/go-jose/go-jose/v3 from 3.0.1 to 3.0.3
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/github.com/go-jose/go-jose/v3/BUG-BOUNTY.md
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 rebase: bump github.com/go-jose/go-jose/v3 from 3.0.1 to 3.0.3
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.16

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[nixpanic]

/cherry-pick release-4.16

manually created #270