Merge branch 'master' of github.com:floodlight/floodlight

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

.../net/floodlightcontroller/core/internal/OFSwitchImpl.java

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

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

...a/net/floodlightcontroller/topology/ITopologyService.java

...a/net/floodlightcontroller/topology/TopologyInstance.java

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

src/main/java/org/openflow/protocol/OFMatch.java

...troller/devicemanager/internal/DeviceManagerImplTest.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java