Use the current Puppet master when launching

Change-Id: Ia5f5320aa77791c6c03b42b395945132e699f57e
Merge "Use the current Puppet master when launching"