[7.17](backport #28501) [pre-commit] for linting merge-conflict, pipelines and JJBB#32747
Merged
[7.17](backport #28501) [pre-commit] for linting merge-conflict, pipelines and JJBB#32747
Commits
Commits on Aug 22, 2022
- authored andcommitted