Merge branch 'master' of github.com:floodlight/floodlight

Conflicts:
	src/main/java/net/floodlightcontroller/core/internal/Controller.java
	src/main/java/net/floodlightcontroller/core/web/EventHistoryAttachmentPointResource.java
	src/main/java/net/floodlightcontroller/core/web/EventHistoryPacketInResource.java
	src/main/java/net/floodlightcontroller/devicemanager/IDeviceManagerService.java
	src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
	src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
	src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
	src/main/java/net/floodlightcontroller/topology/internal/TopologyImpl.java
	src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
	src/test/java/net/floodlightcontroller/devicemanager/test/MockDeviceManager.java
	src/test/java/net/floodlightcontroller/forwarding/ForwardingTest.java