[mapper] removes unnecessary EntityType function templates

thereby fixing ICC build
[tests/mapper] fixes ICC compile