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

Conflicts:
	msautotest