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