Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

...a/net/floodlightcontroller/debugevent/CircularBuffer.java

.../java/net/floodlightcontroller/debugevent/DebugEvent.java

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

...a/net/floodlightcontroller/debugevent/NullDebugEvent.java

...oodlightcontroller/debugevent/web/DebugEventResource.java

...oodlightcontroller/debugevent/web/DebugEventRoutable.java

...java/net/floodlightcontroller/linkdiscovery/LinkInfo.java

...ller/linkdiscovery/internal/EventHistoryTopologyLink.java

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

...htcontroller/linkdiscovery/web/DirectedLinksResource.java

...htcontroller/linkdiscovery/web/ExternalLinksResource.java

.../floodlightcontroller/linkdiscovery/web/LinkWithType.java

...floodlightcontroller/linkdiscovery/web/LinksResource.java

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

...ller/linkdiscovery/internal/LinkDiscoveryManagerTest.java