ported NM plugin to upstream NetworkManager changes