zuul.pp retab + some puppet-lint fix

Change-Id: Ic7cadfad5410bd460aa743bc1e5497301423ecc2