Fix PHP building when GD is disabled. Closes #4550
Merge branch 'branch-6-2' of github.com:mapserver/mapserver into branch-6-2
ignore additional encodings in received content-type headers (#4585)

closes #4585
fix cgi label commands after multi-label changes (#4621)
Merge branch 'branch-6-2'

Conflicts:
	MIGRATION_GUIDE.txt
	maplexer.c