jira/PJSM-210 and jira/PJSM-211

This issue pull request combines jira/PJSM-210 and jira/PJSM-211
--> http://issues.opennms.org/browse/PJSM-210
--> http://issues.opennms.org/browse/PJSM-211

The overall story is PJSM-146
--> http://issues.opennms.org/browse/PJSM-146