Convert puppet::master to using concat. Fixed some first time run issues.