Fix git-p4 for newer versions of Perforce.

Different versions of perforce / git appear to use various naming
schemes for perforce variables. This fix updates the regular expression
to match two known names for the perforce path variable.

Fixes bug #3169

Reviewed at https://reviews.reviewboard.org/r/5120/