8048079: Persistent code store is broken after optimistic types merge

Reviewed-by: sundar, jlaskey, attila
8 files changed