Merge "Fix sonar issues in /crud/service/CrudRestService"