[AH-1636] Only add layerId to content if it's available...
Merge branch 'develop' of ssh://haisulike01.nls.fi/Oskari into develop
Removed unnecessary code and fixed event class missing comma error
Merge branch 'develop' of ssh://haisulike01/Oskari into develop