Jira/NMS-6839

Hey,

Please review and merge if bamboo is green.

Issue: http://issues.opennms.org/browse/NMS-6839
Bamboo: comming soon