Fix Javadoc warnings
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven
Fix errors reported by DOAP, shortened descriptions where required (DOAP accepts max 10 words)