Fix rendering annotation layers with expressions in legend (#4641)
Merge branch 'branch-6-2' of https://github.com/mapserver/mapserver into branch-6-2