Merge pull request #11369 from electricjesus/fix-release-v3.31-calico-base-pin