Fixed handling of comments in CRD files.

Fixes #847
2 jobs for issue-847 in 27 minutes and 44 seconds (queued for 6 seconds)