Fix up modern clang warnings on 8.1.x

[ezelkow1]

Clang has warnings on 8.1.x, so for a future release we probably want to fix these up either via backports or to make clang happy

[github-actions]

This issue has been automatically marked as stale because it has not had recent activity. Marking it stale to flag it for further consideration by the community.