diff --git a/elasticsearch/checkstyle_suppressions.xml b/elasticsearch/checkstyle_suppressions.xml
index 7eff331ddfc..a1d92ba247e 100644
--- a/elasticsearch/checkstyle_suppressions.xml
+++ b/elasticsearch/checkstyle_suppressions.xml
@@ -5,7 +5,4 @@
 
 <suppressions>
   <!-- On Windows, Checkstyle matches files using \ path separator -->
-  <!-- Hopefully temporary suppression of LineLength on files that don't pass it. We should remove these when we the
-    files start to pass. -->
-  <!-- -->
 </suppressions>
diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/SystemUser.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/SystemUser.java
index bce05d05e20..c453119d57e 100644
--- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/SystemUser.java
+++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/SystemUser.java
@@ -32,6 +32,11 @@ public class SystemUser extends User {
         return o == INSTANCE;
     }
 
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+
     public static boolean is(User user) {
         return INSTANCE.equals(user);
     }
diff --git a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/XPackUser.java b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/XPackUser.java
index 55a341a30df..66d4e7f9cc0 100644
--- a/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/XPackUser.java
+++ b/elasticsearch/x-pack/shield/src/main/java/org/elasticsearch/shield/XPackUser.java
@@ -68,6 +68,11 @@ public class XPackUser extends User {
         return INSTANCE == o;
     }
 
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(this);
+    }
+
     public static boolean is(User user) {
         return INSTANCE.equals(user);
     }
diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/ExecutableAlwaysCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/ExecutableAlwaysCondition.java
index 57184a3ca61..0d46fbdeb6d 100644
--- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/ExecutableAlwaysCondition.java
+++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/always/ExecutableAlwaysCondition.java
@@ -35,4 +35,9 @@ public class ExecutableAlwaysCondition extends ExecutableCondition<AlwaysConditi
         return obj instanceof ExecutableAlwaysCondition;
     }
 
+    @Override
+    public int hashCode() {
+        // All instances has to produce the same hashCode because they are all equal
+        return 0;
+    }
 }
diff --git a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/ExecutableNeverCondition.java b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/ExecutableNeverCondition.java
index 71d284ceb7a..912c6b12d94 100644
--- a/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/ExecutableNeverCondition.java
+++ b/elasticsearch/x-pack/watcher/src/main/java/org/elasticsearch/watcher/condition/never/ExecutableNeverCondition.java
@@ -35,4 +35,9 @@ public class ExecutableNeverCondition extends ExecutableCondition<NeverCondition
         return obj instanceof ExecutableNeverCondition;
     }
 
+    @Override
+    public int hashCode() {
+        // All instances has to produce the same hashCode because they are all equal
+        return 0;
+    }
 }