Fix SUSE header to avoid issues with new+old header code

[tomschr]

Thanks to Gayathri, we included a xsl:choose to distinguish between old and new header code.