pull puppet-3 changes to LocalSettings.inc.php