merge hcoop transport configuration changes