[kde-workspace/f17] (4 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  40d0867... ongoing systemd_inhibit work (#859227) (*)
  5ef7edf... Fixed SystemD support in kdisplaymanager.cpp (for switching (*)
  fcfa9f6... monitor sleep settings reset, resulting in monitor turning  (*)
  f0e210f... Merge branch 'f18' into f17

(*) This commit already existed in another branch; no separate mail sent