Fix point->draw() fails when no LABEL defined (closes #4572)
Merge branch 'branch-6-2' of github.com:mapserver/mapserver into branch-6-2