OF-744 Replace package.html with package-info.java
Merge branch 'master' of https://github.com/igniterealtime/Openfire