Conflicts: hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
Conflicts: hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>