LPS-45615 Fix bug regarding entityMapping in ServiceBuilder