Fix race in puppet::self (puppet.conf compilation)
Sometimes puppet::self compiles the puppet.conf before removing the
10-main.conf in puppet.conf.d, causing the puppet.con to contain
both the main.conf and self.conf templates.
It should have only one or the other and this change should ensure
that the operations happen in the correct order (hopefully!)