Merge changes Ie2676b20,Ie8db6f85

* changes:
  Connectivity metrics: add WakeupStats events
  Connectivity metrics: collect NFLOG wakeup events
tree: 2170eabc3f222400815ed43b78fd8e60b2f02818
  1. core/
  2. services/
  3. tests/