MULE-7329: fixing compilation issues due to backport