Address a bunch of code-analysis quick fixes#1761

Mpdreamz merged 1 commit intomainelastic/docs-builder:mainfrom

fix/code-analysiselastic/docs-builder:fix/code-analysisCopy head branch name to clipboard