Merge upstream changes.
Thank you.
Correct coco.d filename in shipped Defsfile files
Change level2/coco3/defs/Defsfile to use coco.d instead of coco3.d
Change Defsfile to use coco.d instead of coco3.d in level2/coco3