Merge with trunk

diff --cc tests/Makefile.am
index 1124abb13f8206e93a79b61243a783e063b5b2a3,f429b8ad8136ec3d428791ea8b812da7cc0110ed..2cc23bd68586c654f0bb31b8ef3f3f4948f4da16
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -218,11 -215,10 +218,11 @@@ TESTS += 
        test-login-qt5-guest-fail-setup-script \
        test-login-qt5-guest-logout \
        test-login-qt5-remote-session \
-       test-qt4-power \
-       test-qt4-power-no-console-kit \
-       test-qt4-power-no-login1 \
-       test-qt4-power-no-services
 +      test-users-qt5 \
+       test-qt5-power \
+       test-qt5-power-no-console-kit \
+       test-qt5-power-no-login1 \
+       test-qt5-power-no-services
  endif
  
  EXTRA_DIST = \