Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  ProjectCreationValidatorIT: Fix expected substring

Change-Id: If04f7bb6f7656c40e29eec6a5f511790d1cf7452
diff --git a/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorIT.java b/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorIT.java
index a6259ed..6f74514 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/projectgroupstructure/ProjectCreationValidatorIT.java
@@ -81,7 +81,7 @@
     // Creation is rejected when root project name contains slashes
     RestResponse r = userRestSession.put("/projects/" + Url.encode("a/parentProject"), in);
     r.assertConflict();
-    assertThat(r.getEntityContent()).contains("Root project name cannot contains slashes");
+    assertThat(r.getEntityContent()).contains("Root project names cannot contain slashes");
   }
 
   @Test