diff -Nru network-manager-1.2.2/debian/changelog network-manager-1.2.2/debian/changelog
--- network-manager-1.2.2/debian/changelog	2016-06-28 08:27:03.000000000 +0000
+++ network-manager-1.2.2/debian/changelog	2016-08-17 10:55:29.000000000 +0000
@@ -1,3 +1,20 @@
+network-manager (1.2.2-0ubuntu7) yakkety; urgency=medium
+
+  [ Martin Pitt ]
+  * debian/NetworkManager.conf: Re-Drop "dns=dnsmasq" option again, resolved
+    now does DNS requests on port 53 so that chrome and other NSS deniers
+    work.
+  * debian/network-manager.postinst: Fix conf.d path with mkdir.
+  * Make /run/NetworkManager/conf.d/* files override corresponding ones in
+    /usr/lib/. (LP: #1614043)
+  * Move libgnutls-dev build dependency (which does not exist any more) to
+    libgnutls28-dev.
+
+  [ Aron Xu ]
+  * Fix invalid nmcli options in bug report script (LP: #1582803)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 17 Aug 2016 12:55:29 +0200
+
 network-manager (1.2.2-0ubuntu6) yakkety; urgency=medium
 
   * Make connection list available to some nmc_secrets_requested() calls 
diff -Nru network-manager-1.2.2/debian/control network-manager-1.2.2/debian/control
--- network-manager-1.2.2/debian/control	2016-06-28 08:26:36.000000000 +0000
+++ network-manager-1.2.2/debian/control	2016-08-17 10:55:29.000000000 +0000
@@ -19,7 +19,7 @@
                ppp-dev (>= 2.4.7-1+1),
                libpolkit-gobject-1-dev,
                libpolkit-agent-1-dev (>= 0.97),
-               libgnutls-dev,
+               libgnutls28-dev,
                libgcrypt20-dev,
                uuid-dev,
                systemd (>= 185),
@@ -61,7 +61,6 @@
          isc-dhcp-client (>= 4.3.1-5ubuntu1),
          libpam-systemd,
          policykit-1,
-         dnsmasq-base,
 Recommends: ppp (>= 2.4.6),
             iptables,
             modemmanager,
@@ -70,6 +69,7 @@
             network-manager-pptp,
             network-manager-gnome | plasma-widget-networkmanagement | plasma-nm,
             modemmanager | ofono,
+            libnss-resolve,
 Suggests: avahi-autoipd,
           python,
 Breaks: network-manager-gnome (<< 0.9),
diff -Nru network-manager-1.2.2/debian/NetworkManager.conf network-manager-1.2.2/debian/NetworkManager.conf
--- network-manager-1.2.2/debian/NetworkManager.conf	2016-06-28 08:26:36.000000000 +0000
+++ network-manager-1.2.2/debian/NetworkManager.conf	2016-08-17 10:55:29.000000000 +0000
@@ -1,6 +1,5 @@
 [main]
 plugins=ifupdown,keyfile,ofono
-dns=dnsmasq
 
 [ifupdown]
 managed=false
diff -Nru network-manager-1.2.2/debian/network-manager.postinst network-manager-1.2.2/debian/network-manager.postinst
--- network-manager-1.2.2/debian/network-manager.postinst	2016-06-28 08:26:36.000000000 +0000
+++ network-manager-1.2.2/debian/network-manager.postinst	2016-08-17 10:55:29.000000000 +0000
@@ -46,7 +46,7 @@
         fi
 
 	if dpkg --compare-versions "$2" le "1.2.2-0ubuntu4"; then
-		mkdir -p /usr/lib/NetworkManager/conf.d || true
+		mkdir -p /etc/NetworkManager/conf.d || true
 		# for old versions, override the global config with a null config
 		touch /etc/NetworkManager/conf.d/10-globally-managed-devices.conf
 	fi
diff -Nru network-manager-1.2.2/debian/patches/Read-system-connections-from-run.patch network-manager-1.2.2/debian/patches/Read-system-connections-from-run.patch
--- network-manager-1.2.2/debian/patches/Read-system-connections-from-run.patch	2016-06-28 08:26:40.000000000 +0000
+++ network-manager-1.2.2/debian/patches/Read-system-connections-from-run.patch	2016-08-17 10:55:29.000000000 +0000
@@ -4,9 +4,26 @@
 
 Bug-Ubuntu: https://launchpad.net/bugs/1594551
 ---
+ src/nm-config.c                       |  5 +++--
  src/settings/plugins/keyfile/plugin.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
+ 2 files changed, 21 insertions(+), 2 deletions(-)
 
+diff --git a/src/nm-config.c b/src/nm-config.c
+index e962f91..9784986 100644
+--- a/src/nm-config.c
++++ b/src/nm-config.c
+@@ -925,8 +925,9 @@ read_entire_config (const NMConfigCmdLineOptions *cli,
+ 	for (i = 0; i < system_confs->len; ) {
+ 		const char *filename = system_confs->pdata[i];
+ 
+-		/* if a same named file exists in config_dir, skip it. */
+-		if (_nm_utils_strv_find_first ((char **) confs->pdata, confs->len, filename) >= 0) {
++		/* if a same named file exists in config_dir or RUN_CONFIG_DIR, skip it. */
++		if (_nm_utils_strv_find_first ((char **) confs->pdata, confs->len, filename) >= 0 ||
++		    _nm_utils_strv_find_first ((char **) run_confs->pdata, run_confs->len, filename) >= 0) {
+ 			g_ptr_array_remove_index (system_confs, i);
+ 			continue;
+ 		}
 diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
 index 6003c74..8a968c1 100644
 --- a/src/settings/plugins/keyfile/plugin.c
diff -Nru network-manager-1.2.2/debian/source_network-manager.py network-manager-1.2.2/debian/source_network-manager.py
--- network-manager-1.2.2/debian/source_network-manager.py	2016-06-28 08:26:36.000000000 +0000
+++ network-manager-1.2.2/debian/source_network-manager.py	2016-08-17 10:55:29.000000000 +0000
@@ -68,7 +68,7 @@
         report['Tags'] += ' ' + ' '.join(tags)
 
     #add output of nmcli
-    report['nmcli-nm'] = command_output(['nmcli', '-f', 'all', 'nm'])
+    report['nmcli-nm'] = command_output(['nmcli', '-f', 'all', 'gen'])
     report['nmcli-dev'] = command_output(['nmcli', '-f', 'all', 'dev'])
     report['nmcli-con'] = command_output(['nmcli', '-f', 'all', 'con'])