UP-3679:  Merging pull request #116, plus a couple modest tweaks
NOJIRA:  Fixing the artifactId of a dependency where the value that's needed in uP 4.1 is changed verses (different from) what's needed in 4.0