Cherry-pick of the commits mentioned by https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/merge_requests/46#note_1566186.
Cherry-pick of the commits mentioned by https:/ /gitlab. gnome.org/ GNOME/NetworkMa nager-openvpn/ -/merge_ requests/ 46#note_ 1566186.