misc/dsh.pp: retab and almost pass puppet lint

Change-Id: I692e125c8236ce29ec54cba80eefd61034f6d21f
Merge "misc/dsh.pp: retab and almost pass puppet lint" into production