Merge pull request #593 from rizard/master

...main/java/net/floodlightcontroller/core/OFConnection.java

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

...dlightcontroller/core/annotations/LogMessageCategory.java

.../floodlightcontroller/core/annotations/LogMessageDoc.java

...floodlightcontroller/core/annotations/LogMessageDocs.java

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

.../floodlightcontroller/core/internal/OFChannelHandler.java

...ghtcontroller/core/internal/OFSwitchHandshakeHandler.java

...t/floodlightcontroller/core/internal/OFSwitchManager.java

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

...et/floodlightcontroller/core/util/ListenerDispatcher.java

...ava/net/floodlightcontroller/core/util/SingletonTask.java

...floodlightcontroller/core/web/ControllerRoleResource.java

...net/floodlightcontroller/core/web/SwitchResourceBase.java

...loodlightcontroller/flowcache/PortDownReconciliation.java

.../java/net/floodlightcontroller/forwarding/Forwarding.java

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

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

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

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