merge fix
Merge branch 'master' of git://github.com/OpenNMS/opennms
Merge remote-tracking branch 'origin/master' into features/maven-cleanup