Fix more checkstyle warnings.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1439199 13f79535-47bb-0310-9956-ffa450edef68
Correct header template, allow legacy package.html.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1439200 13f79535-47bb-0310-9956-ffa450edef68