Conflicts:
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java