Fix bug 3895: Port from libnm-util/libnm-glib to libnm