[MJAVADOC-406] + [MJAVADOC-407] Regression by MJAVADOC-398

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1627863 13f79535-47bb-0310-9956-ffa450edef68
[maven-release-plugin] prepare release maven-javadoc-plugin-2.10.1

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