Fix conversion from old style heads/p4 to remotes/p4/master