Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  ContentTypeUtil: Add singleton scope

Change-Id: I1eaae0a2bb52bc4256562151471655e6ca213b53

src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ContentTypeUtil.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ContentTypeUtil.java b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ContentTypeUtil.java
index bb6f9db..517d245 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ContentTypeUtil.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ContentTypeUtil.java
@@ -24,6 +24,7 @@
 import com.google.gerrit.server.config.ProjectConfigEntry;
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
+import com.google.inject.Scopes;
 import com.google.inject.name.Named;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,7 +42,7 @@
 
       @Override
       protected void configure() {
-        bind(ContentTypeUtil.class);
+        bind(ContentTypeUtil.class).in(Scopes.SINGLETON);
         bind(ProjectConfigEntry.class)
             .annotatedWith(Exports.named(KEY_BINARY_TYPES))
             .toInstance(