Merge from trunk.

git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/branches/SI_MAVEN_2_1_A@679476 13f79535-47bb-0310-9956-ffa450edef68
18 files changed