Jenkins-11390, 11391 fixes

These two commit address two issues, Jenkins-11390 and Jenkins-11391.

These commits allow the AccuRev plugin to play nicer with other plugins