Applied (backport) patch for #4810 to mapfile.c.
Update INSTALL.CMAKE
revert change
fix travis build + update autotest submodule
update autotest submodule
Merge branch 'branch-6-4'

Conflicts:
	.travis.yml
	msautotest