Merge "Upgrades os-net-config to stable/danube"