Merge "Enable fluentd in context-cookiecutter (mitaka/ocata)"