Stop cherry-picking in infra

We encountered some problems, notably, the updated commit message
breaks "git brannch -d" workflow, and Sean Dague ran into problems
with the implementation in Gerrit.

Change-Id: I9f2d411bb9c926b3da919bb9ab986dd589f9f42c
Reviewed-on: https://review.openstack.org/37348
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins

modules/openstack_project/files/gerrit/acls/openstack-infra/askbot-theme.config

@@ -10,4 +10,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/config.config

@@ -7,4 +7,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/gitdm.config

@@ -10,4 +10,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/jeepyb.config

@@ -10,4 +10,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/jenkins-job-builder.config

@@ -9,5 +9,4 @@
 [receive]
         requireChangeId = true
 [submit]
-        action = cherry pick
         mergeContent = true

modules/openstack_project/files/gerrit/acls/openstack-infra/odsreg.config

@@ -11,4 +11,3 @@
         requireContributorAgreement = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-apparmor.config

@@ -12,4 +12,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-dashboard.config

@@ -12,4 +12,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/puppet-vcsrepo.config

@@ -15,4 +15,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/releasestatus.config

@@ -10,4 +10,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/reviewday.config

@@ -10,4 +10,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/reviewstats.config

@@ -10,4 +10,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/openstack-infra/zuul.config

@@ -12,4 +12,3 @@
         requireChangeId = true
 [submit]
         mergeContent = true
-        action = cherry pick

modules/openstack_project/files/gerrit/acls/test-manage-project.config

@@ -9,7 +9,6 @@
 	requireShortMessage = true
 [submit]
 	mergeContent = true
-	action = cherry pick
 [project]
 	state = active
 [access "refs/meta/config"]

modules/openstack_project/files/zuul/layout-dev.yaml

@@ -122,7 +122,6 @@ projects:
       - gate-noop
 
   - name: openstack-infra/config
-    merge-mode: cherry-pick
     check:
       - config-compare-xml
       - gate-config-layout

modules/openstack_project/files/zuul/layout.yaml

@@ -282,7 +282,6 @@ projects:
       - gate-noop
 
   - name: openstack-infra/config
-    merge-mode: cherry-pick
     check:
       - config-compare-xml
       - gate-config-layout