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

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

...a/net/floodlightcontroller/core/internal/RoleChanger.java

...odlightcontroller/core/module/FloodlightModuleLoader.java

...tcontroller/core/web/serializers/LinkTupleSerializer.java

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

.../floodlightcontroller/flowcache/FlowReconcileManager.java

...et/floodlightcontroller/linkdiscovery/ILinkDiscovery.java

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

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

...ava/net/floodlightcontroller/linkdiscovery/LinkTuple.java

...t/floodlightcontroller/linkdiscovery/SwitchPortTuple.java

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

...floodlightcontroller/linkdiscovery/web/LinksResource.java

src/main/java/net/floodlightcontroller/packet/BSN.java

...va/net/floodlightcontroller/restserver/RestApiServer.java

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

...java/net/floodlightcontroller/topology/NodePortTuple.java

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

...ller/linkdiscovery/internal/LinkDiscoveryManagerTest.java