Bug fix

 * fix fd leak
 * locator is not stored in service now. It lives only while connecting
 * Locator service api extended