MANTA-129 update marlin for new moray (cont)
MANTA-129 update marlin for new moray (cont)

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