This should let freshly recompiled golangci-lint binaries using Go 1.17 pass 'make lint'
Also re-enabled some tests that had to be disabled in the prior PR.