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

Sync common files