Intent to backport OAK-7136 to 1.8

[Robert Munteanu]

Hi,

I intent to backport OAK-7136 to the 1.8 stable branch. The fixes are
basically moving the metatype.properties files in the right directory,
so I expect zero issues.

Thanks,

Robert