Merge "Fixed sonar issue i PolicyFinderServiceImpl.java"