BZ-6379: refactor scrubPartialUrl for new paths