jira/NMS-7083

* http://issues.opennms.org/browse/NMS-7083
* http://bamboo.internal.opennms.com:8085/browse/OPENNMS-NMS146