mapserver-64: updates for HEAD build