Switch git-commit-id plugin to refer to .git using ${project.basedir}
Merge remote-tracking branch 'origin/1.9-maint'