(TK-3) Modify APIs for service functions

Modify APIs for the service functions that deal with a specific,
user specified server. For all of these functions, the server-id
is now the second argument, rather than the last one.