Rename predefined field names for cluster and union layers (#4082)
Merge branch 'master' of https://github.com/mapserver/mapserver into issue4082
Merge pull request #4894 from szekerest/issue4082

Issue4082
Merge branch 'master' of https://github.com/mapserver/mapserver into rfc91-filter-transform