Traunk tracking: update from r3852 to r3872

Note that there's quite a few substantive system changes here.  Note also that Josh is overhauling that console / static content / stats support; the first change landed this past week and I've inserted a shim for it, but a serious rewrite using a full request context of some sort will need to happen once the entire change is in.