Merge "IP connectivity metrics: remove obsolete system-current entries"