Made changes to handling "p4 base directory"