UP-3705 : Edit the report graph jsp so that the graph doesn't load
until you click the submit button.
NOJIRA include attachments portlet in all-lo layout
Don't make the search on principal user until 3 chars are entered, and define a timeout on ajax search
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
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
Solve Issue when adding new portlet and when portlets in list as a display name containing a simple quote
UP-3621:  Refactor clearPass support for uPortal (apply this earlier fix to rel-4-0-patches as well)
UP-3621:  Also ask for the proxyTicket in try/catch, because that will also fail typically in local dev environments
NOJIRA add context.xml to Notification portlet
NOJIRA upgrade Notifications portlet to 2.0.3
NOJIRA enhance portlet worker thread not completing warning message
UP-3743 Improved error message for unhandled web exceptions
Upgraded maven-release-plugin to version 2.4.1

Conflicts:
	pom.xml
UP-3710 Fix create/update of quarter details

Only delete quarter details from DB if they have actually changed
UP-3712 Fix term detail to only delete/update if needed