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

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

...ontroller/core/web/serializers/OFMatchJSONSerializer.java

.../java/net/floodlightcontroller/devicemanager/IDevice.java

...t/floodlightcontroller/devicemanager/internal/Device.java

...t/floodlightcontroller/devicemanager/internal/Entity.java

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

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

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

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

.../floodlightcontroller/linkdiscovery/web/LinkWithType.java

...floodlightcontroller/linkdiscovery/web/LinksResource.java

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

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

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

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

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

...troller/devicemanager/internal/DeviceManagerImplTest.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java

...test/java/net/floodlightcontroller/packet/PacketTest.java