Conflicts:
	bigfloodlight/src/test/java/com/bigswitch/floodlight/bvs/virtualrouting/internal/VirtualRoutingHintTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/flowcache/BigFlowReconcileMgrTest.java
	bigfloodlight/src/test/java/com/bigswitch/floodlight/flowcache/FlowReconcileEngineTest.java

[BVS-486] getPortType will default to UPLINK ports for BigSwitchOVS.  The autoportfast detection is performed only in BSNOVS and Xenon switches.

BVS-515 (https://github.com/bigswitch/bigswitchcontroller/pull/3608)

mostly cleanup (https://github.com/bigswitch/bigswitchcontroller/pull/3633)

* alwasy log stack trace at debug level (even if we just log the message
  at error)
* don't wrap other exceptions in SwitchStateException. We don't log that
  with stack trace
* IOFSwitch.setDebugCounterService now throws the correct exception

BSC-3818 BSC-3817 Send SNMP traps for switch connect and port changes (https://github.com/bigswitch/bigswitchcontroller/pull/3607)

add fields to forwardingconfig model in bigcon to hold idle/hard timeouts
add storage listeners for these 2 columns in bigfloodlight's forwarding

Fixes: non IP wildcards (BVS-525), ForwardingTest  (https://github.com/bigswitch/bigswitchcontroller/pull/3572)

Enable switch read/write throttling by default (https://github.com/bigswitch/bigswitchcontroller/pull/3578)

Flattened debug counters REST output a little bit.

Conflicts:
	bigfloodlight/src/main/java/com/bigswitch/floodlight/forwarding/Forwarding.java

moving counter registration to init() methods, and use of metadata constants

DebugEvents beta  (https://github.com/bigswitch/bigswitchcontroller/pull/3545)

Register Vendor Actions on Floodlight startup (https://github.com/bigswitch/bigswitchcontroller/pull/3538)

Don't allow 0 MAC address. More comprehensive DevMgr unit tests. BVS-516  (https://github.com/bigswitch/bigswitchcontroller/pull/3511)

 - flushNow is a property of the update instead of the event
 - event timestamp is displayed in ISO8601 style
 - event registry returns an event updater object instead of the eventId
 - event update is done with a user defined object which is accessed via reflection and annotations
 - metadata is expressed using varargs and metadata string constants
 - changed unit tests