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

Conflicts:
	floodlight/src/main/java/net/floodlightcontroller/core/OFSwitchBase.java
	floodlight/src/main/java/net/floodlightcontroller/core/internal/OFChannelHandler.java
	floodlight/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
	floodlight/src/test/java/net/floodlightcontroller/util/OFMessageDamperMockSwitch.java