Re #8334. Fixing the tests and the redhat build.
Merge branch 'feature/8334_icp_event_log_changes' into develop