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

...floodlightcontroller/core/IFloodlightProviderService.java

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

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

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

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

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

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

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

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