There were a few merge conflicts, but the tests pass so I hope I didn't miss anything :) I'd appreciate someone looking over them though, in particular the server setup in the tests, since that API changed in 5.0.
The build is broken because this repo hasn't been migrated to the new APIs. I say we merge this and then migrate and restore the build as a separate task.
I manually copied over the changes in 4.1:
There were a few merge conflicts, but the tests pass so I hope I didn't miss anything :) I'd appreciate someone looking over them though, in particular the server setup in the tests, since that API changed in 5.0.