PJSM-229

This pull request covers issues:
 * http://issues.opennms.org/browse/PJSM-238
 * http://issues.opennms.org/browse/PJSM-239
 * http://issues.opennms.org/browse/PJSM-240

Bamboo: http://bamboo.internal.opennms.com:8085/browse/OPENNMS-NMS177

Please review and merge.