NMS-6839

Hey,

Please review and merge if bamboo is green.

Issue: http://issues.opennms.org/browse/NMS-6839
Bamboo: http://bamboo.internal.opennms.com:8085/browse/OPENNMS-NMS82

Please note, that the target branch is **rc/stable/1.14.0**