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

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

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

...a/net/floodlightcontroller/firewall/FirewallResource.java

.../floodlightcontroller/firewall/FirewallRulesResource.java

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

...htcontroller/notification/NotificationManagerFactory.java

...er/staticflowentry/web/StaticFlowEntryPusherResource.java

src/main/java/org/openflow/protocol/OFMatchBeanInfo.java

...et/floodlightcontroller/core/internal/ControllerTest.java

...odlightcontroller/core/internal/OFChannelHandlerTest.java

...net/floodlightcontroller/core/util/SingletonTaskTest.java

...a/net/floodlightcontroller/debugevent/DebugEventTest.java

.../java/net/floodlightcontroller/firewall/FirewallTest.java