[7.x](backport #28501) [pre-commit] for linting merge-conflict, pipelines and JJBB#28536
Merged
[7.x](backport #28501) [pre-commit] for linting merge-conflict, pipelines and JJBB#28536
Commits
Commits on Oct 19, 2021
- authored andcommitted
