Add further utilities to cmake build (#4617)
Update symbol references when removing a symbol (#4656)
Handle Content-Type HTTP headers with a charset appended.

The fix for #4585 in cgiutil.c is also needed in mapows.c to handle Content-Type HTTP headers with a charset appended.
Merge branch 'branch-6-2'
Small fix to shpxy in templates
Merge branch 'branch-6-2'