Merge branch 'lr/rpm-make-check'

https://bugzilla.gnome.org/show_bug.cgi?id=739127

diff --cc callouts/tests/Makefile.am
Simple merge

diff --cc contrib/fedora/rpm/NetworkManager.spec
Simple merge

diff --cc libnm/nm-object.c
Simple merge

diff --cc libnm/tests/test-nm-client.c
Simple merge

diff --cc src/NetworkManagerUtils.c
Simple merge

diff --cc src/settings/plugins/ibft/tests/Makefile.am
Simple merge

diff --cc src/settings/plugins/ifnet/tests/Makefile.am
Simple merge

diff --cc src/tests/test-general-with-expect.c
Simple merge