I don't believe that the settings catalog was taken into consideration, and it complicates things. Off the top of your head do you know if puppet.conf is read and evaluated before the settings catalog is applied?