[MSHARED-373] Upgrade Maven baseline to 2.2.1

- Added missing generics
- Worked out some TODOs
- Used some 2.1.1 methods

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1634380 13f79535-47bb-0310-9956-ffa450edef68
[maven-release-plugin] prepare release maven-archiver-2.6

git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1634393 13f79535-47bb-0310-9956-ffa450edef68