Merge "Fix warnings in netconfig-monitoring"