Fixes bug 832359 - Fixed code duplication in puppet scripts when elasticsearch and HBase are installed together.
Merge pull request #1083 from AdrianGaudebert/832359-elasticsearch-vagrant

Fixes bug 832359 - Fixed code duplication in puppet scripts when elastic...