Merge "Sonar- LocateServiceImpl.java"