allow custom hp_service_type
applied hp_service_type fix on all services.
Merge pull request #2177 from omarreiss/allow-custom-hp-service-type

allow custom hp_service_type