[MediaWiki-Core] Merging Puppet changes