Merge remote-tracking branch 'bigswitch/master' into xenonsupp

...dlightcontroller/core/web/ControllerSwitchesResource.java

src/main/java/net/floodlightcontroller/debugevent/Event.java

...t/floodlightcontroller/debugevent/IDebugEventService.java

...t/floodlightcontroller/devicemanager/internal/Device.java

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

...va/net/floodlightcontroller/topology/TopologyManager.java

...a/net/floodlightcontroller/debugevent/DebugEventTest.java

...troller/devicemanager/internal/DeviceManagerImplTest.java