Re: #3740: fix critpath generation to be per branch and properly import into pkgdb