Replace duplicate files with Freemarker templates. /  (#SDT-22, #SDT24) Fixed
Fix partial commit #ec93c74 /  (#SDT-22, #SDT-24) Fixed
Merge branch 'issue/SDT-16-threeten' into devel