Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

...odlightcontroller/devicemanager/IEntityClassListener.java

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

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

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

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

...et/floodlightcontroller/core/internal/ControllerTest.java