Merge latest stable improvements

resource-discovery/src/main/java/eu/nebulous/resource/discovery/monitor/DeviceProcessor.java

@@ -148,10 +148,10 @@ private void processFailedDevices() {
                 log.info("Trying to use existing BrokerPublisher to publish device lost message");
                 //device_lost_publisher = new BrokerPublisher(processorProperties.getLost_device_topic(), processorProperties.getNebulous_broker_ip_address(), processorProperties.getNebulous_broker_port(), processorProperties.getNebulous_broker_username(), processorProperties.getNebulous_broker_password(), "");
                 int sending_attempt = 1;
-                while (device_lost_publisher.is_publisher_null()){
+                while (device_lost_publisher==null || device_lost_publisher.is_publisher_null()){
 
                     try {
-                        log.warn("Will now make attempt No "+sending_attempt+" to recreate the BrokerPublisher connector for the lost device topic");
+                        log.warn("Will now make attempt No "+sending_attempt+" to (re)create the BrokerPublisher connector for the lost device topic");
                         log.info("The topic name is "+processorProperties.getLost_device_topic()+", the broker ip is "+ processorProperties.getNebulous_broker_ip_address()+", the broker port is "+ processorProperties.getNebulous_broker_port()+", the username is "+ processorProperties.getNebulous_broker_username()+", and the password is "+ processorProperties.getNebulous_broker_password());
 
                         device_lost_publisher = new BrokerPublisher(processorProperties.getLost_device_topic(), processorProperties.getNebulous_broker_ip_address(), processorProperties.getNebulous_broker_port(), processorProperties.getNebulous_broker_username(), processorProperties.getNebulous_broker_password(), "");