Manually applied changes made by Indigo423 in https://github.com/StCyr/opennms/pull/1

Cyrille