Merge remote-tracking branch 'floodlight/master' into addrspace

build.xml

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

...in/java/net/floodlightcontroller/counter/CountSeries.java

...ghtcontroller/devicemanager/internal/AttachmentPoint.java

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

...t/floodlightcontroller/learningswitch/LearningSwitch.java

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

...main/java/net/floodlightcontroller/packet/BasePacket.java

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

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

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

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

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

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

...ightcontroller/staticflowentry/StaticFlowEntryPusher.java

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

...dlightcontroller/virtualnetwork/VirtualNetworkFilter.java

...es/net.floodlightcontroller.core.module.IFloodlightModule

src/main/resources/floodlightdefault.properties

...ghtcontroller/core/module/FloodlightTestModuleLoader.java