SOS-1571 Dont use clases from *.service.persistence.* outside of a *LocalServiceImpl or *ServiceImpl