Merge with trunk

diff --combined tests/Makefile.am
index 5f9e4bb44fe8924b313381a5f43abeebe3826e4a,2e9150b6b146fe119857233a5ba06419f6d8cc1b..d97016a3fd2ff97e20fa7d1cd1c5a1b9182410f0
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -182,15 -182,17 +182,18 @@@ TESTS = 
        test-xdmcp-server-open-file-descriptors \
        test-multi-seat \
        test-multi-seat-seat0-non-graphical \
+       test-multi-seat-seat0-non-graphical-disabled \
        test-multi-seat-non-graphical \
+       test-multi-seat-non-graphical-disabled \
        test-multi-seat-change-graphical \
+       test-multi-seat-change-graphical-disabled \
        test-mir-autologin \
        test-mir-greeter \
        test-mir-session \
        test-mir-session-crash \
        test-mir-session-compositor-crash \
        test-mir-container-session \
 +      test-mir-script-hooks \
        test-unity-compositor-command \
        test-unity-compositor-not-found \
        test-unity-compositor-fail-start \
@@@ -203,15 -205,13 +206,15 @@@
        test-unity-login \
        test-unity-switch \
        test-unity-plymouth \
 +      test-unity-script-hooks \
        test-unity-mir-autologin \
        test-unity-mir-greeter-x-session \
        test-unity-mir-greeter-mir-session \
        test-unity-mir-lock-seat \
        test-unity-mir-session-x-greeter \
        test-unity-mir-switch \
 -      test-unity-mir-switch-to-user-resettable
 +      test-unity-mir-switch-to-user-resettable \
 +      test-unity-mir-script-hooks
  
  #     test-session-exit-error
  #     test-greeter-no-exit
@@@ -446,14 -446,16 +449,17 @@@ EXTRA_DIST = 
        scripts/mir-autologin.conf \
        scripts/mir-container-session.conf \
        scripts/mir-greeter.conf \
 +      scripts/mir-script-hooks.conf \
        scripts/mir-session.conf \
        scripts/mir-session-compositor-crash.conf \
        scripts/mir-session-crash.conf \
        scripts/multi-seat.conf \
        scripts/multi-seat-change-graphical.conf \
+       scripts/multi-seat-change-graphical-disabled.conf \
        scripts/multi-seat-non-graphical.conf \
+       scripts/multi-seat-non-graphical-disabled.conf \
        scripts/multi-seat-seat0-non-graphical.conf \
+       scripts/multi-seat-seat0-non-graphical-disabled.conf \
        scripts/no-accounts-service.conf \
        scripts/no-config.conf \
        scripts/no-console-kit.conf \
@@@ -520,12 -522,10 +526,12 @@@
        scripts/unity-mir-greeter-mir-session.conf \
        scripts/unity-mir-lock-seat.conf \
        scripts/unity-mir-greeter-x-session.conf \
 +      scripts/unity-mir-script-hooks.conf \
        scripts/unity-mir-session-x-greeter.conf \
        scripts/unity-mir-switch.conf \
        scripts/unity-mir-switch-to-user-resettable.conf \
        scripts/unity-plymouth.conf \
 +      scripts/unity-script-hooks.conf \
        scripts/unity-switch.conf \
        scripts/upstart-autologin.conf \
        scripts/upstart-login.conf \