Merge branch 'bigsyncfix' into bigsync

...floodlightcontroller/core/IFloodlightProviderService.java

src/main/java/net/floodlightcontroller/core/IOFSwitch.java

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

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

...loodlightcontroller/core/internal/EventHistorySwitch.java

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

...ntroller/core/web/EventHistoryTopologySwitchResource.java

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

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

src/main/java/net/floodlightcontroller/routing/Link.java

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

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

...main/java/net/floodlightcontroller/util/EventHistory.java

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

.../floodlightcontroller/core/internal/OFSwitchBaseTest.java

...loodlightcontroller/core/test/MockFloodlightProvider.java

.../floodlightcontroller/util/OFMessageDamperMockSwitch.java