Cdx Gen: Add -new-canon-classic and -new-canon-surt to the canonicalizer, also use 11 field format
with new canon