add/remove servers command support

Change-Id: I093af83878b115c5c57f146c193379e63877be51