Patch resolving NMS-6924 for develop branch

Edit by mvrueden: 
* http://issues.opennms.org/browse/NMS-6924