Fix CDTOC FK in schema-17 migration.
Merge branch 'cdtoc-fk'

* cdtoc-fk:
  Fix CDTOC FK in schema-17 migration.