r4942: converted the cifs backend to not use event_context_merge(). Instead,