Last fixes for  #18190
Merge branch 'sprint3' of github.com:eea/eea.elasticsearch.river.rdf into sprint3