MANTA-1228 svc:/smartdc/marlin-agent:default should be renamed ...
MANTA-1228 svc:/smartdc/marlin-agent:default should be renamed ...

joyent/manta-marlin,davepacheco/manta-marlin,davepacheco/manta-marlin,davepacheco/manta-marlin,joyent/manta-marlin,joyent/manta-marlin