Set server explicitly for first puppet run

Change-Id: I5568185d65bd2b9c2b9c4412275d8ec12765097e
Merge "Set server explicitly for first puppet run" into production