merge of logs controllers
RavenDB-1662 fix