Adding 'strip workspace path' and workaround for Mercurial plugin incompatibility