Move log4j properties to xml and remove unused elasticsearch.yml file

(cherry picked from commit b07fc7c)