Sync common files
Merge pull request #175 from elasticsearch/puppet_management

Sync common files