Merge branch 'fix' into 'pregmod-master'

eslint hotfix

See merge request !8069

.eslintrc.json

@@ -125,7 +125,7 @@
 		"sonarjs/no-one-iteration-loop": "error",
 		"sonarjs/no-use-of-empty-return-value": "error",
 		"sonarjs/no-collection-size-mischeck": "warn",
-		"sonarjs/no-same-line-conditional": "info",
+		"sonarjs/no-same-line-conditional": "warn",
 		"sonarjs/no-unused-collection": "warn"
 	}
 }