Merge "Refactor apt_mirantis/elastic"