BZ-7370: rewrite deps file and fix up the scrubPartialUrl method