split puppet::master in a separate file, reindent it and add a include for puppet::queue since that's needed