[ELF-28] migrate to oskari upstream 1.18