Merge branch 'enable_logstash_kibana_dashboard' into custom