TOOLS-947: Avoid service duplication when agent services have been added to SAPI
TOOLS-947: Avoid service duplication when agent services have been added to SAPI

joyent/sdcadm,joyent/sdcadm,joyent/sdcadm