Merge commit 'origin/template' into log

* commit 'origin/template':
  ssh: Disable changing of the oom_adj value.
  ssh: Add default initscript configuration.

* commits left out:
  rsyslog: Use another format for forwarding messages.