Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  ListGroups: Accept --ownedby as an alias of --owned-by
  Fix documentation of owned-by option in groups REST API
  Update git submodules
  ListTestPlugin: Add missing license header
  Update git submodules
  gerrit-config.txt: cache-automerge is for "merge" commmits

Change-Id: I18a08c9850400ce92ce16677b5441fe4c3d82a8b

Documentation/config-gerrit.txt

diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 16d4a99..6ba3866 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -1180,7 +1180,7 @@
 
 [[change.cacheAutomerge]]change.cacheAutomerge::
 +
-When reviewing diff commits, the left-hand side shows the output of the
+When reviewing merge commits, the left-hand side shows the output of the
 result of JGit's automatic merge algorithm. This option controls whether
 this output is cached in the change repository, or if only the diff is
 cached in the persistent `diff` cache.

Documentation/rest-api-groups.txt

diff --git a/Documentation/rest-api-groups.txt b/Documentation/rest-api-groups.txt
index 00fd81f..85f7329 100644
--- a/Documentation/rest-api-groups.txt
+++ b/Documentation/rest-api-groups.txt
@@ -126,13 +126,13 @@
 
 ==== Find groups that are owned by another group
 
-By setting `ownedBy` and specifying the link:#group-id[\{group-id\}] of another
+By setting `owned-by` and specifying the link:#group-id[\{group-id\}] of another
 group, it is possible to find all the groups for which the owning group is the
 given group.
 
 .Request
 ----
-  GET /groups/?ownedBy=7ca042f4d5847936fcb90ca91057673157fd06fc HTTP/1.0
+  GET /groups/?owned-by=7ca042f4d5847936fcb90ca91057673157fd06fc HTTP/1.0
 ----
 
 .Response

java/com/google/gerrit/acceptance/rest/ListTestPlugin.java

diff --git a/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java b/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java
index 00e7d32..00e071c 100644
--- a/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java
+++ b/java/com/google/gerrit/acceptance/rest/ListTestPlugin.java
@@ -1,3 +1,17 @@
+// Copyright (C) 2019 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package com.google.gerrit.acceptance.rest;
 
 import com.google.common.collect.ImmutableList;

java/com/google/gerrit/server/restapi/group/ListGroups.java

diff --git a/java/com/google/gerrit/server/restapi/group/ListGroups.java b/java/com/google/gerrit/server/restapi/group/ListGroups.java
index 9eb8e8a..7c52300 100644
--- a/java/com/google/gerrit/server/restapi/group/ListGroups.java
+++ b/java/com/google/gerrit/server/restapi/group/ListGroups.java
@@ -205,7 +205,10 @@
     options.addAll(ListOption.fromBits(ListGroupsOption.class, Integer.parseInt(hex, 16)));
   }
 
-  @Option(name = "--owned-by", usage = "list groups owned by the given group uuid")
+  @Option(
+      name = "--owned-by",
+      aliases = {"--ownedby"},
+      usage = "list groups owned by the given group uuid")
   public void setOwnedBy(String ownedBy) {
     this.ownedBy = ownedBy;
   }