Merge "docker: don't use custom run-os-net-config"