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