Resolve remaining import export differences

What does this MR do?

This backports remaining import/export spec changes from EE to CE.

Does this MR meet the acceptance criteria?

Conformity

• Code review guidelines
• Merge request performance guidelines
• Style guides
• Database guides
• Separation of EE specific content