Merge schema2 and oci schema import logic

This MR merges the import logic for schema2 and oci manifests.

The logic itself is identical between types, only accessing the fields prevented this merger.