UP-3705 : Edit the report graph jsp so that the graph doesn't load
until you click the submit button.
Merge remote-tracking branch 'upstream/master'
UP-3735 Add error handling for event aggregation

Add error handling to the conversion of a PersistentPortalEvent to PortalEvent
so that mal-formed JSON won't break the entire aggregation process.