Jira/PJSM-247

http://issues.opennms.org/browse/PJSM-247