more smokeping, if this isnt the last one I am totally swapping to puppetmaster::self

Change-Id: I37edec2b821f01077d153be1367e73ce0719b870
Merge "more smokeping, if this isnt the last one I am totally swapping to puppetmaster::self" into production