Merge pull request #360 from alexreimers/master

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

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

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

...java/net/floodlightcontroller/routing/ForwardingBase.java

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

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

...t/floodlightcontroller/topology/TopologyInstanceTest.java

...et/floodlightcontroller/topology/TopologyManagerTest.java