jira/PJSM-254

Please review...

See issue http://issues.opennms.org/browse/PJSM-254 for details.