Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b

* changes:
  IP metrics: update link layer mapping
  IP connectivity metrics: fix tests after proto update
  Connectivity metrics: update ipconnectivity.proto