Merge commit 'origin/template' into log

* commit 'origin/template':
  nss: Add some comments.
  rsyslog: Move all rsyslog log files into a subdir.
  rsyslog: Update logrotate config to new rsyslog config.
  rsyslog: Add default logrotate config.
  rsyslog: Disable logging of kernel messages.
  rsyslog: Enable loggin of mark lines.
  rsyslog: Clean up rsyslog configuration.
  rsyslog: Add default configuration.

* commits left out:
  rsyslog: Send all logs to the log vserver.