jira/NMS-6868

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