Fix rendering legend icons for labelpnt and labelpoly geometry transformations (#4642)
Merge branch 'branch-6-2'

Conflicts:
	maplegend.c