Refs #8817, use p.a.event events for the org and focal point sections too
Merge branch 'master' of https://github.com/syslabcom/osha.hwccontent