LPS-45710 Fix bug regarding entityMapping in ServiceBuilder