UP-3654:  Merging fix submitted by jameswennmacher in pull request #113, plus a couple tweaks
UP-3654:  Swich from the short-lived uPdata plugin to the consolidated uportal-maven-plugin
UP-3654:  Fix build errors that cropped up from this effort (bundled CalendarPortlet)
UP-3664:  Bookmarks uwfn.tld apparently doesn't load on Tomcat7
UP-3668 Allow aggregator to inspect event

Add API to allow aggregator to determine if it supports aggregation of the actual
event instead of just the event type
UP-3669 Reduce potential sources of flushing

During event aggregation no event flushing should occure, this change
should prevent any hibernate data flush until the aggregation block
is complete
UP-3670 Fix data-import build options

Pass valid args to maven command
Use filters file for database config
UP-3672:  Build fails with 'Detected both jcl-over-slf4j.jar AND slf4j-jcl.jar on the class path, preempting StackOverflowError'
Fix bad class name reference in docs
UP-3671
UP-3671:  Create a new Portal Activity framework portlet that shows some basic info about current users, logins, and searches
UP-3654:  Fix parent version identifier for overlay Calendar in rel-4-0-patches