Fixes for #14135
I think we can also add sample for ProductService aswell for module extension so users can understand how to extend user-created microservice entities.
