Fix normalized CID fonts for direct write 6.1.

Fixes:
#1263
#1821
#2280 (A linux issue)

I've also moved where we remove cid key values for when we re-renable the cff cid font test file when stable is 19.