Avoiding generating expensive logging if debugging is not enabled
Merge branch 'master' of github.com:Graylog2/graylog2-server
Setting a default for the no_retention flag

Fixes #584