Merge pull request #11039 from SmithSamuelM/sam_raet_18

Sam raet 18 Added support for generic Raet road and key data persistence