Updated mapserver.h and HISTORY.TXT for 6-2-1 release.