Merge pull request #3780 from rmehta/service-product-bundle

[enhancement] make service type product bundle #3452