Fixing server list serialization

Change-Id: Idcf99d5c66548ba9b809bb98d5a6376211afd844