[pre-commit] for linting merge-conflict, pipelines and JJBB#28501

v1v merged 2 commits intoelastic:masterelastic/beats:masterfrom

v1v:feature/pre-commitv1v/beats:feature/pre-commitCopy head branch name to clipboard