merge hcoop mail routing changes