MANATEE-115 add more robust retry logic
MANATEE-115 add more robust retry logic

GrimDerp/manatee,josephglanville/manatee,joyent/manatee,joyent/manatee,josephglanville/manatee,AmlingPalantir/manatee,GrimDerp/manatee,AmlingPalantir/manatee