Merge ServerConfg and ModularServerConfig

[turt2live]

With the exception of a few lines, they are the exact same component to the letter.

[t3chguy]

This is alleviated by matrix-org/matrix-react-sdk#3303 which makes one subclass the other, could probably be tidied further

[turt2live]

I'd call it fixed tbh.