This should let freshly recompiled golangci-lint binaries using Go 1.17 pass 'make lint'
The query can be performed using a prefix query on the ID index. Also backport some enterprise changes to prevent conflicts.