Jira/nms 6966

Jira: http://issues.opennms.org/browse/NMS-6966
Bamboo: http://bamboo.internal.opennms.com:8085/browse/OPENNMS-NMS116