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/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.
WIDGPT-31 jasig-widget-portlet to use sl4j/logback
UP-3737 Allow local accounts to edit their password
NOJIRA:  Tidy up some whitespace (was a tangled mixture of spaces and tabs) in an area before making changes to it
UP-3551:  Header portlets within the hidden=false header folder are not expanded in maximized mode
UP-3621:  Add a try/catch (with a WARN log) around obtaining the password from ClearPass so if that part fails, it won't sink the whole AuthN
UP-3621:  Also ask for the proxyTicket in try/catch, because that will also fail typically in local dev environments