updating smokeping puppetization

Change-Id: I9cc90d20a4300263c943f54cecbe8ebe776be600
Merge "updating smokeping puppetization" into production