Merge branch 'bootstrap2logstash'
Merge branch 'poc_fence'