UP-3705 : Edit the report graph jsp so that the graph doesn't load
until you click the submit button.
UP-3725:  Portlet Manager -- preferences from portlet.xml (defaults) are not appearing in the setParameters.jsp screen
Merge remote-tracking branch 'upstream/rel-4-0-patches' into rel-4-0-patches
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.
WIDGPT-31 jasig-widget-portlet to use sl4j/logback
UP-3737 Allow local accounts to edit their password