adapt to the servant/servant-server split, prepare new release