Merge current files from rdcastro/logstash-packaging