Merge pull request #1426 from mdboom/unit/cds-prefixes-faux

Support the wacky prefixes in CDS unit format
Added changelog entry for #1426