Merge branch 'stable-3.3'

* stable-3.3:
  Add missing @Override to SSHLog.toAuditLog
  Fix config.md keys using @PLUGIN@ placeholder
  Revert "Remove getCacheKey() from AuditUser"

Change-Id: I9ca77f1ae443b81f13d5b59ad473a6050ab52624

src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java
index b68670f..f57db23 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/AuditUser.java
@@ -27,6 +27,11 @@
   }
 
   @Override
+  public Object getCacheKey() {
+    return null;
+  }
+
+  @Override
   public Optional<String> getUserName() {
     return Optional.of(username);
   }

src/main/java/com/googlesource/gerrit/plugins/auditsl4j/logsource/SSHLog.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/logsource/SSHLog.java b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/logsource/SSHLog.java
index 03d9bed..daf3c1d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/logsource/SSHLog.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/auditsl4j/logsource/SSHLog.java
@@ -149,6 +149,7 @@
     return Optional.empty();
   }
 
+  @Override
   public Optional<String> toAuditLog(LoggerAudit loggerAudit) {
     return getWhen()
         .map(

src/main/resources/Documentation/config.md

diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index a18a878..e60c678 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -7,10 +7,10 @@
 The audit configuration can be defined in the main gerrit.config
 in a specific section dedicated to the audit-sl4j plugin.
 
-gerrit.audit-sl4j.format
+plugin.@PLUGIN@.format
 :	Output format of the audit record. Can be set to either JSON
     or CSV. By default, CSV.
     
-gerrit.audit-sl4j.logName
+plugin.@PLUGIN@.logName
 :	Write audit to a separate log name under Gerrit logs directory.
-    By default, audit records are put into the error_log.
\ No newline at end of file
+    By default, audit records are put into the error_log.