Refactor es mapping generation
(from redmine: issue id 1292, created on 2019-05-09tgradl, closed on 2019-05-14)