PJSM-229

This pull request covers three issues:
 * http://issues.opennms.org/browse/PJSM-238
 * http://issues.opennms.org/browse/PJSM-239
 * http://issues.opennms.org/browse/PJSM-240

Bamboo: not available yet (we currently do not need a bamboo build)

Please Review and merge.