Conflicts:

	floodlight/build.xml
	floodlight/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java