Don't make the search on principal user until 3 chars are entered, and define a timeout on ajax search
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
UP-3711 Merge cache manages to allow replication messages

Conflicts:
	uportal-war/.gitignore
	uportal-war/src/main/resources/properties/ehcache.xml

Conflicts:
	uportal-war/.gitignore
UP-3713 Purge empty portal cookies
UP-3713 Fix broken unit test
UP-3713 log more info about portlet cookie expiration
UP-3713 Fix empty cookie expiration date calc