MULE-7594: Merge from branch mule-3.x