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

Adapt to work with new cms-git-tools.