some more fixes for new hook path format
Merge branch 'master' into sshkeys_refactoring