Bump trunk client version

I no longer think the timeouts are due to a bug in golangci-lint, but rather a result of the first non-cached run of golangci-lint being very resource intensive and shared runners having relatively small resources.

The original thesis was close - @ursa9r removed the issue in !3216 (merged)

This branch is now ready to merge, with a single lint fix broken out to a separate commit for easier review.