Merge branch 'branch-6-2'
Merge branch 'branch-6-2'

Conflicts:
	msautotest
take into account style min/max scale in legend (#4601)

the mapscript and template code calling these updated functions
are hardcoded to do scale-independant legend rendering to remain
backwards compatible.
Fix segfault in readPostBody when CONTENT_LENGTH environmenet variable is not defined
mapwfs.c: correctly pair CPL allocation routines with CPL free routines
OGR WFS output: do not force null integer values to 0 (#4633)
update autotest submodule for #4633
Merge branch 'branch-6-2'

Conflicts:
	msautotest
CMAKE: Add zlib to the libraries list when png is added
Merge branch 'master' of https://github.com/mapserver/mapserver
update submodule after #4633 and #4499
Exposed labelObj.text and labelObj.expression in PHP/MapScript (closes #4310)
Merge branch 'branch-6-2'
Merge branch 'branch-6-2'
Added per-label TEXT attribute in xml schema and xsl (closes #4639)
The text param of point->draw in php is now optional, no need of strlen(labeltext) in libmapserver (#4572)
harmonize 32/64bit behavior when rounding

- use lrint
- avoid floats
- no implicit casts
Fix rendering annotation layers with expressions in legend (#4641)
Legend icons do not reflect geometry transformations (#4642)

Conflicts:

	maplegend.c
Clean up the extra class added when rendering pie charts (#4645)