Merge pull request #7216 from rootp1/fix-helm-e2e-plugin-manager