Updates to maven plugins
Merge branch 'master' into dev/FEND-901