Merge branch 'master' of github.com:gmarz/elasticsearch-support-diagnostics into gmarz-master