This one wasn't too bad since it's in the same repo at least. Majority of conflicts were in test code (disabling broken tests upstream that we don't have or are already commented out).
This corresponds to the upstream commit range:
Did have to be a bit careful because they've likely auto-linted upstream which adds many (technically) necessary commas we didn't have but I think I caught them all.
Doing a testbuild on
tb-build-05 overnight and we'll find out I suppose.