Change config for git commit plugin in starter parent

Fixes gh-1489
Merge 1.1.x and resolve minor conflict