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

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

@@ -205,7 +205,10 @@ public class ListGroups implements RestReadView<TopLevelResource> {
     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;
   }