added initial 3.5 ServerLocator