Merge changes Ic0515cec,If547bd96 into pi-dev

* changes:
  metrics: identifying dfs from non dfs scans
  metrics: watchdog connection delay field