Dani, you are a life saver once again!
I was actually able to just make the one change from the tracker and get everything running: https://github.com/NeillM/moodle/commit/2c60b807955e95cd7d37ddf40f079cc48ef59113 I'm just trying to avoid doing a full update of dev until we can also update our live site.
Thank you, and thanks to Marcus as well for your help looking into this.