LPS-45615 Fix bug regarding entityMapping in ServiceBuilder. The mapping doesn't work when the services are in different service.xml files