[addons] cleanup the service add-on pre/post install code
Merge pull request #5022 from jmarshallnz/service_addon_installs

[addons] cleanup the service add-on pre/post install code