Adding git-p4 support.
Fixing issues raised following review.
Merge branch 'git-p4'