refs #8330. Fix unknown ICP entry issue.

Add two additional ICP conditions.
Revert "refs #8330. Fix unknown ICP entry issue."

This reverts commit 069f60c198ec48730a2cc944dd1acfddc4bc6402.
Revert "Revert "refs #8330. Fix unknown ICP entry issue.""

This reverts commit ffdc611a839433233c3086ba8d8e267631bf5df2.
refs #8330. Fix failing test.

Inspect the ICP event log for this workspace to see why the number needed changing.
refs #8330. Fix warning.
Merge remote-tracking branch 'origin/feature/8330_icp_events'