Merge branch 'branch-6-4'
update msautotest submodule
Adjusting INSPIRE WMS 1.1.1 capabilities. Fixes #4861.
Merge branch 'branch-6-2' into branch-6-4

Conflicts:
	msautotest
Merge branch 'branch-6-4'

Conflicts:
	mapows.c
	msautotest
Updating msautotest submodule.
Implement RFC108 heatmap support (#4857)

also adds:
 - rfc86 scaletoken substitutions for PROCESSING entries
 - proj fastpaths for 3857->4326 reprojections