Synchronizing puppet config.js with Hilary branch.