jira/PJSM-248

Please review:

http://issues.opennms.org/browse/PJSM-248