Merge into master from pull request #313:

...net/floodlightcontroller/core/OFMessageFilterManager.java

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

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

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

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

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

...lightcontroller/core/web/AllSwitchStatisticsResource.java

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

...troller/core/web/EventHistoryTopologyClusterResource.java

...controller/core/web/EventHistoryTopologyLinkResource.java

...et/floodlightcontroller/core/web/PacketTraceResource.java

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

...n/java/net/floodlightcontroller/counter/CounterStore.java

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

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

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

...lightcontroller/packetstreamer/PacketStreamerHandler.java

...dlightcontroller/packetstreamer/PacketStreamerServer.java

...net/floodlightcontroller/perfmon/PktInProcessingTime.java

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