4038: add "fixes #" to acceptable merge commit messages
Merge branch '4038-commit-hooks-accept-fixes'

Closes #4038.