Switch to versioned image and Makefile for Fluentd/Elasticsearch image