Update typeMap.xsl from upstream