Added javadoc and some minor changes
Merge branch 'master' of github.com:OpenNMS/opennms