Merge pull request #3628 from raul-arabaolaza/patch-1

Try to use a known working ath docker image

core/src/main/java/jenkins/security/apitoken/ApiTokenStore.java

@@ -75,7 +75,7 @@ public class ApiTokenStore {
         this.init();
     }
     
-    private ApiTokenStore readResolve() {
+    private Object readResolve() {
         this.init();
         return this;
     }
@@ -356,7 +356,7 @@ public class ApiTokenStore {
             this.init();
         }
     
-        private HashedToken readResolve() {
+        private Object readResolve() {
             this.init();
             return this;
         }

essentials.yml

@@ -2,5 +2,6 @@
 ath:
   useLocalSnapshots: false
   athRevision: "06caf67d37d945ec5228a80d73714fac692c28d3"
+  athImage: "jenkins/ath:acceptance-test-harness-1.62"
   categories:
     - org.jenkinsci.test.acceptance.junit.SmokeTest