Merge branch 'master' of github.com:alexreimers/floodlight into backport

build.xml

lib/commons-logging-1.1.1.jar

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

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

.../java/net/floodlightcontroller/firewall/FirewallRule.java

...floodlightcontroller/firewall/FirewallRuleSerializer.java

.../floodlightcontroller/firewall/FirewallRulesResource.java

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

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

...ava/net/floodlightcontroller/routing/IRoutingService.java

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

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

src/test/java/org/openflow/util/ProducerConsumerTest.java