ISPN-4342 Minor maven plugin upgrades and fixes

https://issues.jboss.org/browse/ISPN-4342