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

...main/java/net/floodlightcontroller/core/OFSwitchBase.java

...va/net/floodlightcontroller/core/internal/Controller.java

.../floodlightcontroller/core/internal/OFChannelHandler.java

...a/net/floodlightcontroller/debugcounter/DebugCounter.java

.../net/floodlightcontroller/debugcounter/IDebugCounter.java

...oodlightcontroller/debugcounter/IDebugCounterService.java

...t/floodlightcontroller/debugcounter/NullDebugCounter.java

...ightcontroller/debugcounter/web/DebugCounterResource.java

...ightcontroller/debugcounter/web/DebugCounterRoutable.java

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

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

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

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

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

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

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

src/main/java/org/sdnplatform/sync/internal/SyncManager.java

.../org/sdnplatform/sync/internal/rpc/RPCChannelHandler.java

...dnplatform/sync/internal/store/ListenerStorageEngine.java

...odlightcontroller/core/internal/OFChannelHandlerTest.java