PJSM-237

I created this pull request to review Dustin's code changes.

 * Jira: http://issues.opennms.org/browse/PJSM-237
 * Bamboo: we do not have bamboo set up for smnnepo-gruslab yet.

Please do not merge, until @fooker says this PR is ready.