Merge branch 'backport' of ../bigswitchcontroller

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

...main/java/net/floodlightcontroller/core/OFSwitchBase.java

...dlightcontroller/linkdiscovery/ILinkDiscoveryService.java

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

...ain/java/net/floodlightcontroller/loadbalancer/LBVip.java

...a/net/floodlightcontroller/loadbalancer/LoadBalancer.java

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

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

...n/java/org/openflow/protocol/OFStatisticsMessageBase.java

src/main/java/org/openflow/protocol/action/OFActionType.java

...ain/java/org/openflow/protocol/action/OFActionVendor.java

...a/org/openflow/protocol/action/OFActionVendorGeneric.java

...main/java/org/openflow/protocol/factory/BasicFactory.java

.../org/openflow/protocol/factory/OFVendorActionFactory.java

...org/openflow/protocol/factory/OFVendorActionRegistry.java

src/main/java/org/openflow/util/IProducer.java

src/main/java/org/openflow/util/ProducerConsumer.java

...t/floodlightcontroller/loadbalancer/LoadBalancerTest.java

src/test/java/org/openflow/protocol/BasicFactoryTest.java

...t/java/org/openflow/protocol/action/MockVendorAction.java