Adapt to work with new cms-git-tools.
Merge pull request #51 from ktf/fix-cmspm-v22

Adapt to work with new cms-git-tools.