jira/PJSM-209 #2

Please review and merge...

http://issues.opennms.org/browse/PJSM-209