puppet-merge: Fix bug introduced in 4a79aa1

The grep in 4a79aa1 was looking for one or more leading spaces before
match the one which was not happening due to wc -l's output. Since this
is a number a nice way to fix it is to arithmetically compare to 1

Change-Id: I49b5c1fa77985f0236f0e2ab916b8bc5d219630e
Merge "puppet-merge: Fix bug introduced in 4a79aa1" into production