DocCode test change for foreignKey fixup after stranding.
DocCode fixup ( again)
More metadataStore serialization cleanup