Handle git-p4 metadata with additional options in the revision tags.

When the git-p4 clone is used with an option like 'keepRepoPath', it breaks our
revision parsing. Making a trivial change to the regex handles these cases.

Fixes bug 3220.