Add DataConflict operational event type
Add DataConflict operational event type

To be used when importing data and incoming data cannot be accommodated by ODMS for some reason.  The specifics will be documented in the event description itself.
ccls/odms,ccls/odms,ccls/odms,ccls/odms