update tests (#4624)
Merge branch 'branch-6-2'
update expected results

for mapserver/mapserver#4105 , mapserver/mapserver#4599 and
mapserver/mapserver#4520