Gds upgrade 7.25.0

Right. So. This PR gets us up to a point before things will start breaking as functionality post 7.25.0 effects ODI.

It's a whole bunch of needs api, router api and some test fixes.