move EntityUtils out of MarketplaceService module