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