Merge "Prepare for git-commit-id plugin upgrade"