Fixes https://github.com/matrix-org/dendrite/issues/2980
As discussed yesterday, a first draft of merging the keyserver and the userapi.