update after coverity fixes

mapserver/mapserver#4866
Merge branch 'branch-6-4'