Lurking from the shadows I noticed L45 in this commit. This looks like one find/replace too many. You may want to change the confdir puppet manages, but why would you want to change the path where puppet looks for the config template?