Merge into master from pull request #204:

Fix Device Manager entity handling code [BSC-2046] (https://github.com/floodlight/floodlight/pull/204)

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -527,8 +527,8 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
             if (srcEntity == null)
                 return Command.STOP;
 
-            // Learn/lookup device information
-            Device srcDevice = learnDeviceByEntity(srcEntity);
+            // Find the device by source entity
+            Device srcDevice = findDeviceByEntity(srcEntity);
             if (srcDevice == null)
                 return Command.STOP;