Merge remote branch 'origin/master' into rm-userset

diff --cc cli/src/connections.c
Simple merge

diff --cc libnm-glib/Makefile.am
Simple merge

diff --cc src/NetworkManager.conf
Simple merge

diff --cc src/nm-device.c
Simple merge

diff --cc src/nm-manager.c
Simple merge

diff --cc src/nm-policy.c
Simple merge

diff --cc src/system-settings/nm-default-wired-connection.c
Simple merge