Merge branch 'master' into stable
workaround for new events list layout problem
admin cache-history layout change
fixed german translation of log status schanges
allow OC team comment logs for any locked caches
adjusted log messages
record status-change user id when disabling users -> locking caches