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