Merge remote branch 'origin/master' into zvm

diff --cc libnm-util/libnm-util.ver
Simple merge

diff --cc libnm-util/nm-utils.c
Simple merge

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

diff --cc system-settings/plugins/ifcfg-rh/reader.c
Simple merge

diff --cc system-settings/plugins/ifcfg-rh/writer.c
Simple merge