Fix potential issue in socket cache with local services

Change-Id: I386eafc477f2f184841ae625ff0fe3d546695b07
Reviewed-on: http://gerrit.aldebaran.lan/49097
Tested-by: gerrit
Reviewed-by: pdaouadi <pdaouadi@aldebaran-robotics.com>
Approved: tfontenay <tfontenay@aldebaran-robotics.com>
Reviewed-by: tfontenay <tfontenay@aldebaran-robotics.com>
Tested-by: tfontenay <tfontenay@aldebaran-robotics.com>
Reviewed-on: http://gerrit.aldebaran.lan/49184
Reviewed-by: gschweitzer <gschweitzer@aldebaran-robotics.com>
Tested-by: gschweitzer <gschweitzer@aldebaran-robotics.com>
Merge commit 'refs/integration/team/tardis/dev-15'