Merging TSPRP into the Main Server

It is done.

As an aside, I’ve updated the proposal in my OP to reflect some of the feedback that’s come in. If I’ve missed any or you disagree with a decision, please let me know.