Fix erroneous warning on puppet-merge

Gerrit is the commiter on merges and as such, the script issues a false
warning when a merge happens

Change-Id: Ie560fa48172c8d68b8f481a615c0f32032bf7e72
Merge "Fix erroneous warning on puppet-merge" into production