[MNG-612] Merged MNG-612 maven-artifact branch from 2.0.x: https://svn.apache.org/repos/asf/maven/components/branches/MNG-612/maven-artifact/