Merge branch 'master' into reconcileEvents

.../java/com/bigswitch/floodlight/vendor/OFActionMirror.java

...gswitch/floodlight/vendor/OFActionNiciraTtlDecrement.java

.../com/bigswitch/floodlight/vendor/OFActionTunnelDstIP.java

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

src/main/java/net/floodlightcontroller/debugevent/Event.java

...t/floodlightcontroller/debugevent/IDebugEventService.java

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

.../java/org/openflow/protocol/action/OFActionDataLayer.java

...in/java/org/openflow/protocol/action/OFActionEnqueue.java

...openflow/protocol/action/OFActionNetworkLayerAddress.java

...penflow/protocol/action/OFActionNetworkTypeOfService.java

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

...org/openflow/protocol/action/OFActionStripVirtualLan.java

.../org/openflow/protocol/action/OFActionTransportLayer.java

src/main/java/org/sdnplatform/sync/internal/SyncManager.java