Limit --filter-branch to git vers. supporting it

Namely at least git 1.7.10.
Merge branch 'master' into for_puppet