Require only MasterServices to the ServerManager constructor

currently we pass Server and MasterServices to the ServerManager.
MasterServices is a Server and in tests where we try to pass only one of the two we end up with NPEs if the code change.
remove the Server arg and just pass the MasterServices