Misc p4 bugs

Fixes https://github.com/TeamMentor/Master/issues/449 and https://github.com/TeamMentor/Master/issues/467